d9b3161775
Update emote.dm
2020-06-09 10:53:10 -07:00
e9a8daf805
Update say.dm
2020-06-09 10:45:52 -07:00
9523a3c1b3
Update say_vr.dm
2020-06-09 10:45:00 -07:00
6b4f7886e4
Merge pull request #12471 from Citadel-Station-13/poplock
...
poplocks hijack/glorious death
2020-06-09 17:02:32 +02:00
51189d7a04
of copper and gold
2020-06-09 08:00:01 -04:00
14c9ab2ff1
ports tgs regal rats ( #12479 )
...
* port regal rats
* fix missing line
* royal rat goes after humans too
* okay dont let them attack people
* let them attack people but at less damage
* remove header
2020-06-09 03:28:00 -07:00
77a6511cc7
Fixing two issues. ( #12481 )
2020-06-09 03:26:19 -07:00
81070b8ada
New fermi chem Zeolites! ( #12428 )
...
* Zeolites!
* No loner hs debug numbers...
2020-06-09 03:25:40 -07:00
764ba26ace
Pouches ( #12432 )
...
* The Ammo Pouch
It holds magazines and most forms of ammo.
* The Ammo Pouch
It holds magazines and most forms of ammo.
2020-06-09 03:22:39 -07:00
3692323615
plushmium: the fermichem that creates sentient plushies ( #12450 )
...
* create plushie mob and chem
* better plush
* sentience
* fixes
* more fixes
* spelling error
* okay this works better
* more work on sentiency
* fixes
* further fixes
* revert plush storage changes, add splash effect
* fix icons
* undo a change that i guess isnt needed
* remove spaces
* plushies are now space immune
* make warning text more clear
* dont give them more health than bears?
* give them 0/1 stamina damage
* bugfix
* squeak when attacked
* small refactor
2020-06-09 03:21:18 -07:00
ec3c15ef0d
TCOMMS porting
2020-06-09 11:24:08 +03:00
b6dc41b852
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
094a1b6f62
More vr sleeper work and map fix
2020-06-09 11:06:16 +03:00
19949b842b
Transfer valve and VR sleeper
2020-06-09 11:05:54 +03:00
139720e2ce
Update code/modules/antagonists/traitor/classes/martyr.dm
...
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-06-08 21:16:32 -07:00
3960050c71
Update code/modules/antagonists/traitor/classes/hijack.dm
...
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-06-08 21:16:26 -07:00
798de9baf1
Porting "Speeds up /datum/light_source/proc/update_corners() by 16% or so" ( #12496 )
2020-06-08 21:15:26 -07:00
e3487b2adf
boy oh boy
2020-06-08 21:08:40 -07:00
907d909861
Merge pull request #12493 from DeltaFire15/eldritch-affairs-exploit-fix
...
[s] xenobio golems can no longer be used to exploit eldritch affairs mechanics
2020-06-09 02:22:04 +02:00
e2466f1e22
tiny bit of better performance
2020-06-08 21:29:29 +02:00
a323fe01d3
This should be fine now.
2020-06-08 20:22:16 +02:00
9866f19eb3
Update code/game/say.dm
...
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-06-08 11:18:24 -07:00
c246e13693
Ok.
2020-06-08 19:15:51 +02:00
bacd5b8478
oops
2020-06-08 19:10:39 +02:00
c29be22f9b
no more gamer time
2020-06-08 19:06:41 +02:00
52d6069e40
Merge pull request #12446 from kevinz000/hotkey_fixes
...
Adds modifier-independent hotkey bindings
2020-06-08 11:28:49 -05:00
1e3fd46c2d
Merge pull request #12472 from Citadel-Station-13/kevinz000-patch-9
...
makes default photosynthesis MUCH less punishing
2020-06-08 11:25:15 -05:00
e5bc651140
Station has a crew loose (Adds Orville-inspired(?) uniform) ( #12447 )
...
* Station has a crew loose
Also adds paramedic to the MedSci Trekkie list
And allows chaplain to wear UniFed Service uniform
* hotfix for digi ops
2020-06-08 09:14:19 -07:00
efddaa8cad
removes early return ( #12483 )
...
This early return, while skipping a few things, is a bad ideaas this pretty much allowed silicons to still interact with the station off-z as it 'skipped' the check for it.
2020-06-08 09:10:06 -07:00
f3af445c94
Update material_container.dm ( #12491 )
2020-06-08 09:09:53 -07:00
b3afed69f4
huffles
2020-06-08 08:47:06 -07:00
2c5e8e2f6a
fix
2020-06-08 06:51:03 -07:00
dcca70e94a
fix
2020-06-08 06:46:19 -07:00
474873cc62
sigh
2020-06-08 05:19:22 -07:00
33c5dfb28e
TTV TGUI, VR sleeper work.
2020-06-08 12:28:16 +03:00
881dfe81c5
Merge pull request #12187 from Trilbyspaceclone/patch-373
...
Nerfs cargo gas selling - MK different pr then the one that addresses this
2020-06-08 08:21:07 +02:00
9e19c0bb17
AAAAAA
2020-06-08 08:19:47 +02:00
ad6b835e8b
Linter.
2020-06-08 08:12:29 +02:00
afff7472d6
ok
2020-06-08 07:39:48 +02:00
6cf4985360
Update large_objects.dm
2020-06-08 01:09:27 -04:00
abaf633ab9
Update large_objects.dm
2020-06-08 01:09:06 -04:00
f1f655268d
Update volumetrics.dm
2020-06-07 22:02:45 -07:00
e47ed9356f
spelling
2020-06-07 21:45:07 -07:00
a4a0295312
ok
2020-06-07 21:27:36 -07:00
495ccc99c5
Porting some cargo/vending updates.
2020-06-08 06:12:51 +02:00
911e45e526
Merge pull request #12443 from timothyteakettle/fix-blueprints
...
fixes dumb blueprint bug to do with noteleport
2020-06-08 00:38:02 +02:00
8ba5c8f690
Merge pull request #12444 from shellspeed1/Makes-internal-tanks-printable
...
Makes internal tanks printable at the engineering lathe
2020-06-08 00:37:26 +02:00
1f65381a09
Merge pull request #12463 from DeltaFire15/ling-specialrole-fuckery
...
Quick ling on_removal() fix
2020-06-08 00:35:45 +02:00
231c11a6ad
Merge pull request #12465 from Linzolle/shotgun-fix
...
shotguns no longer delete shells in their chamber after firing
2020-06-08 00:34:31 +02:00
941525c74a
Merge pull request #12462 from timothyteakettle/fix-kudzu
...
fixes spacevines
2020-06-08 00:33:51 +02:00
kevinz000