Commit Graph

411 Commits

Author SHA1 Message Date
Pieter-Jan Briers
b343f61268 Imports wooden flooring from Eris. 2020-04-22 17:49:42 +02:00
Pieter-Jan Briers
ef4bde5399 Import a bunch of vending machines from Bay.
Not all, I got lazy.
2020-04-22 01:50:53 +02:00
metalgearsloth
60ce5b5089 Add puddles / reagent spills (#743) 2020-04-21 20:23:12 +02:00
zumorica
7fae16bdc8 Re-enable handheld instruments... 2020-04-21 00:21:08 +02:00
Pieter-Jan Briers
b8803ffd33 Table, not worktop. 2020-04-20 18:20:36 +02:00
Pieter-Jan Briers
221882afa5 Tweak color gain factor to reduce disparity between walls and non-walls.
Also increases the brightness of *specifically* walls to make up for it, in content.
2020-04-20 18:16:32 +02:00
Pieter-Jan Briers
3c5228b978 Fix some wrong vending machine icons. 2020-04-20 17:46:27 +02:00
zumorica
3f3b7ca969 Add examine info toggle 2020-04-20 11:37:05 +02:00
Pieter-Jan Briers
dd6c919a32 Re-enable run bind. 2020-04-18 13:47:06 +02:00
Pieter-Jan Briers
20295723b2 Make ghosts twice as fast. 2020-04-18 13:46:56 +02:00
Pieter-Jan Briers
8076ecfc2e You can no longer see the solution contents of humans via examine. 2020-04-18 01:10:41 +02:00
zumorica
e9100db219 LightBulbs now break when thrown 2020-04-13 01:44:05 +02:00
PrPleGoo
7d72e672fd Merge branch 'master' into DecimalReagents 2020-04-12 14:37:36 +02:00
Pieter-Jan Briers
dc9f8d551b Merge pull request #805 from Zumorica/2020-04-09-comms-console-roundend
Adds working communications console that ends the round
2020-04-10 17:02:49 +02:00
Pieter-Jan Briers
aff9f18bc8 Merge pull request #803 from Injazz/bartending
Bartending tricks and some revamping on chemistry components
2020-04-10 11:54:40 +02:00
PrPleGoo
20cb9b92ab Merge branch 'master' into DecimalReagents 2020-04-09 17:24:22 +02:00
Injazz
8f580ecc1b Visually updates contents of the beaker
also adds new syringe sprite from eris
also adds colors to ALL reagents
2020-04-09 16:43:56 +05:00
zumorica
64eafde0c3 Adds working communications console that ends the round 2020-04-09 00:28:56 +02:00
Injazz
4174891c87 some fixes
removes unused interface from DrinkComponent
adds capability to fit inside dispensers for TransformableContainer
removes stomach component from character setup dummy
2020-04-08 17:12:00 +05:00
Injazz
d400f77129 Chemistry revamp and bartending features
-Ability to mix drinks to create cocktails with shiny icons
-New Chemistry System which can relay chemistry events to corresponding components
-moved some solution logic from Shared to Server
-fixed some weird stuff with DrinkComponent
2020-04-08 15:53:15 +05:00
PrPleGoo
db83789d05 Merge remote-tracking branch 'upstream/master' into DecimalReagents 2020-04-05 11:37:03 +02:00
zumorica
a0d114c672 Ghost sprites and a bunch of fixes 2020-04-05 02:29:04 +02:00
zumorica
0902844457 Merge branch 'master' into 2020-03-03-g-g-g-g-g-g-g-g-ghooooosts 2020-04-04 17:17:11 +02:00
Pieter-Jan Briers
ff36b2dcc7 Re-enable instruments with fallback when MIDI isn't available. 2020-03-30 18:36:58 +02:00
Pieter-Jan Briers
43ec392415 Merge pull request #796 from SweptWasTaken/smesfix
Fixed pixel aspect ratio on SMES
2020-03-30 17:44:46 +02:00
Pieter-Jan Briers
eb99b3c0fd Merge pull request #792 from JiimBob/power-checks
Power checks
2020-03-30 17:43:33 +02:00
zumorica
91f039d2af Merge branch 'master' into 2020-03-03-g-g-g-g-g-g-g-g-ghooooosts 2020-03-28 23:48:00 +01:00
Swept
3b06ec8126 Fixed pixel aspect ratio on SMES 2020-03-25 23:16:38 -07:00
PrPleGoo
fa27e44fd4 Sets drawdepth "Mobs" on the Human prototype (#788)
* Update .gitignore

* Revert "Update .gitignore"

This reverts commit bea34f7f34.

* human entities now get their DrawDepth set to Mobs
2020-03-25 02:28:37 +01:00
JiimBob
d645b1470e Added power checks
Added power checks to:
Reagent Dispenser
Medical Scanner
Lathes
Research Console
Vending Machines

Added power device component to:
chem dispenser prototype
medical scanner prototype

Fixes for #706
2020-03-21 15:37:22 -04:00
Decappi
a1357a1ff3 #391 Done Lathe animations (#774)
* Draft PR, do not merge

* Lathe now uses animations. Timing is still wrong, code is very wet, repetitions and unused layers are there.

* Removed (unneeded?) PowerDeviceVisualizer from the lathe
Refactored & Renamed code and variables
Renamed animation names

* WIP protolathe animation

* Working protolathe animation.
I still don't like the solution though.
2020-03-15 17:55:20 +01:00
PrPleGoo
020c74a9cb Changed Item_Base CollisionMask to 0 (#785) 2020-03-15 10:46:09 +01:00
PrPleGoo
dc66621804 Replaced static Rounders with an impleneted interface 2020-03-14 14:04:08 +01:00
py01
aecff31262 Construction recipes can specify if they should be build-able in… (#781)
Co-authored-by: py01 <pyronetics01@gmail.com>
2020-03-06 20:15:44 +01:00
PrPleGoo
5747eb5fac Leather gloves now have HeatResistance at the default heat of bu… (#784)
* Leather gloves now have HeatResistance at the default heat of bulbs.

* Remove trailing whitespace

* Changed Leather gloves to Botanist's leather gloves

* Fixed quotes and removed Heat Resistance from glubs
2020-03-06 20:10:52 +01:00
Swept
ae5924072f I can see clearly now (#778)
* Updates and crafting recipe

* Updated descriptions
2020-03-06 20:08:02 +01:00
zumorica
7f19381bec Ghost command, some other stuff 2020-03-03 20:37:26 +01:00
zumorica
6905394e8a Add placeholder ghost UI, ghost component 2020-03-03 19:10:25 +01:00
Víctor Aguilera Puerto
0ec4cd4bea Fix crash when picking up black ak due case-sensitivity (#776) 2020-03-03 16:56:38 +01:00
py01
6e4b72f6cb Medical scanner eject collision fix (#767)
* MedicalScanner ejection location

* MedicalScanner bounding box change
2020-03-03 14:40:57 +01:00
AJCM-git
9580003a45 Fixing map collisions (#765)
* Git please work as i want you to work

* There were some collision remanants, everything is clean now
2020-03-03 14:40:35 +01:00
AJCM-git
81ab31659b Little projectile enhancements (#764)
*  Little projectile enhancements

*  Lets see if this fixes my fuck up

* Im a weapon smoothbrain. This fixes caliber folders name
2020-03-01 09:09:30 +01:00
py01
196950fb7e Gun Code Modularization + Magazine Fed Shotgun (#751)
* Adds shotgun YAML files

* Adds shotgu ammo and magazine enum value, modularizes some projectile weapon methods

* Fixes guns consuming two bullets on fire

* Finishes shotgun behavior in Projectile Weapon Components

* Gun and ammo modularization

* Updates BallisticMagazineWeapons to be compatible with new AmmoWeapon

* Fixes shotgun spread angles, Fixes shogun YAML

* Gun documentation and ViewVariable specifications

* Removes todo messsage in gun code

* Default gun evenspread fix

* AmmoComponent Name fix

* Fixes Component name

* Projectile refactor code review fixes
2020-02-29 18:09:41 +01:00
ShadowCommander
bd773aef3b Fix CargoProducts (#750) 2020-02-28 14:58:43 +01:00
Swept
3e9b93faee Adds Skub (#740)
* Added Skub

* Added Skub crafting recipe
2020-02-28 14:58:25 +01:00
Swept
37c13099ad Fixes a problem with gloves (#754) 2020-02-28 14:57:25 +01:00
GlassEclipse
abc02fa504 Fixes 1 runtime error message (#742) 2020-02-26 06:30:56 +01:00
CC-4477
cbf3357c13 Added "mm" to boxes.yml into .45mm ammo containers (#739)
Co-authored-by: Check your git settings! <chris@chris-laptop>
2020-02-25 22:36:49 +01:00
Pieter-Jan Briers
58ab7631c2 Give every job their fancy ID types. 2020-02-24 16:58:25 +01:00
Víctor Aguilera Puerto
090dd8cee8 ControlMob verb and command (#724)
* ControlMob verb and command, mobs have MindComponent by default

* Use IActorComponent instead of MindComponent for User entity.
Fixes using Control Mob while aghosting/visiting an entity.

* Use static Loc class
2020-02-24 03:49:40 +01:00