 kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
|
Detective Google
|
ca29246878
|
adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.)
|
2020-02-22 00:02:49 -06:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
|
Winter Flare
|
79967b0ac5
|
Resolving some convos.
Rename Pastries to Pastry & Sweets
Move all sweets to Pastry & Sweets
Revert Weight Class Changes
Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect.
Move Brioche Cake item/recipe
Move Scotch Egg item/recipe
|
2020-02-21 07:16:39 -05:00 |
|
|
TrilbySpaceClone
|
9ae903187f
|
always abuzz
|
2020-02-21 04:18:24 -05:00 |
|
|
Detective Google
|
4c10c830bf
|
Merge remote-tracking branch 'upstream/master' into psych+paramedic
|
2020-02-20 22:17:55 -06:00 |
|
|
Detective Google
|
a8f863f901
|
changes - sprites
|
2020-02-20 22:17:47 -06:00 |
|
|
Ghom
|
503214dee6
|
Update freezer.dm
|
2020-02-21 02:26:52 +01:00 |
|
|
Ghom
|
d38c2bc6c0
|
Update twohanded.dm
|
2020-02-21 02:20:38 +01:00 |
|
|
Lin
|
9999e15db9
|
Merge pull request #11155 from necromanceranne/cham_project_exploities
Cham projector no longer lets you become literally unclickable
|
2020-02-20 16:50:07 -06:00 |
|
|
Ghom
|
7763475b83
|
Merge pull request #10572 from Tupinambis/SiliconDefault
Removes harm prevention clause indicators from relevant sources.
|
2020-02-20 15:33:27 +01:00 |
|
|
Ghom
|
26bbc64f16
|
Merge pull request #11136 from Owai-Seek/broomport-2-17-19
Ports Broom, Tweak Janitor Vendor
|
2020-02-20 11:48:06 +01:00 |
|
|
Ghom
|
d680ab9fd5
|
Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
|
2020-02-20 11:27:48 +01:00 |
|
|
Ghom
|
89f256866d
|
Merge pull request #11033 from kevinz000/cmo_drapes
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
|
2020-02-20 11:24:50 +01:00 |
|
|
Ghom
|
f94f997cc2
|
Merge pull request #11080 from kevinz000/surubatons
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
|
2020-02-20 11:09:46 +01:00 |
|
|
kevinz000
|
fd410963a9
|
Update teleportation.dm
|
2020-02-19 22:23:54 -07:00 |
|
|
kevinz000
|
4373f116e0
|
Update teleportation.dm
|
2020-02-19 22:07:03 -07:00 |
|
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
|
kevinz000
|
8610c7f664
|
better inhands
|
2020-02-19 19:10:19 -07:00 |
|
|
kevinz000
|
6f31e1270e
|
Merge pull request #11098 from Trilbyspaceclone/bows!
Silk into clothing, bows, arrows, quivers and more!
|
2020-02-19 19:05:49 -07:00 |
|
|
kevinz000
|
9589c3116b
|
Merge pull request #11115 from Ghommie/Ghommie-cit583
Something more about runtime errors.
|
2020-02-19 19:03:01 -07:00 |
|
|
kevinz000
|
b983aa75ea
|
Merge pull request #11145 from Ghommie/Ghommie-cit586
Something about pAIs and silicon access priviledges.
|
2020-02-19 18:59:10 -07:00 |
|
|
Arturlang
|
796f51b557
|
Merge branch 'master' into TGUI_Next_Nanites
|
2020-02-20 00:52:55 +02:00 |
|
|
kevinz000
|
b66b8ac2a0
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-19 14:32:28 -07:00 |
|
|
necromanceranne
|
af6df2784c
|
holy shit this was still in the fucking game
|
2020-02-20 04:46:30 +11:00 |
|
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
|
Ghom
|
0619521418
|
Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
Corrects a few cargo crates/exports (and nerfs some)
|
2020-02-19 02:10:25 +01:00 |
|
|
Ghom
|
2b7f27270f
|
Merge pull request #11083 from Hatterhat/sword-cleaning
purifying longswords - alt title "there's no way this should have worked"
|
2020-02-18 19:02:34 +01:00 |
|
|
Ghom
|
08c86ec1ea
|
Merge pull request #11091 from BlueWildrose/master
Podpeople species tail wag fix; also lifebringer name fix
|
2020-02-18 17:11:50 +01:00 |
|
|
Ghommie
|
698f0b8177
|
Something about pAIs and silicon access priviledges.
|
2020-02-18 16:20:44 +01:00 |
|
|
kevinz000
|
49cef552a0
|
cleaner
|
2020-02-18 02:27:38 -07:00 |
|
|
kevinz000
|
43db506161
|
stopa ccidently recycling this
|
2020-02-18 02:26:05 -07:00 |
|
|
kevinz000
|
8666a36b1e
|
fixes most things
|
2020-02-18 02:24:31 -07:00 |
|
|
kevinz000
|
d7949e810e
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-18 02:20:58 -07:00 |
|
|
kevinz000
|
ed36aae74b
|
Merge pull request #11112 from necromanceranne/mech-revival
Mech Stuff: Ports /tg/ pr #44529, reverts #9092 (mostly)
|
2020-02-18 02:18:57 -07:00 |
|
|
Winter Flare
|
1a994e7f1e
|
Ports Broom, Tweak Janitor Vendor
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120
Makes Broom printable.
Reduces Broom sound effect.
Updates Janitor Vendor to have equipment for at least 2 janitors.
|
2020-02-17 23:36:22 -05:00 |
|
|
BlueWildrose
|
cfca197fbb
|
forgot one last change that I made out of frustration because making things bald wasn't working for some reason
|
2020-02-17 19:55:32 -07:00 |
|
|
BlueWildrose
|
930e6f9876
|
Requested changes, ghost_role_spawner.dm
|
2020-02-17 19:47:48 -07:00 |
|
|
Ghom
|
5c60994572
|
Merge pull request #11108 from Seris02/hslshit
makes spraycans rely on HSL lightness instead of an addition of all the RGB values
|
2020-02-17 13:45:23 +01:00 |
|
|
kevinz000
|
cdf358b97e
|
Merge pull request #11101 from Ghommie/Ghommie-cit581
Porting (admin-only) pair pinpointers and fixing an edge case runtime.
|
2020-02-16 16:08:11 -07:00 |
|
|
Ghom
|
eaa45d4b35
|
Update implant_hijack.dm
|
2020-02-16 15:48:38 +01:00 |
|
|
Ghommie
|
23ae9996d2
|
Something more about runtime errors.
|
2020-02-16 15:24:15 +01:00 |
|
|
kevinz000
|
379c914099
|
Merge pull request #10704 from Ghommie/Ghommie-cit529
More Runtimenator fixes.
|
2020-02-16 05:10:19 -07:00 |
|
|
necromanceranne
|
5c2e244ee0
|
Ports /tg/ pr #44529, reverts #9092
|
2020-02-16 22:20:50 +11:00 |
|
|
Seris02
|
788a9f5b59
|
WOOPS
|
2020-02-16 16:39:35 +08:00 |
|
|
Hatterhat
|
b60b0a95aa
|
you ever just forget that if statements exist
|
2020-02-16 02:28:12 -06:00 |
|
|
Trilbyspaceclone
|
f6afa28ce0
|
Update shields.dm
|
2020-02-16 02:03:48 -05:00 |
|
|
Trilbyspaceclone
|
3fde58434f
|
Merge branch 'master' into more_implants
|
2020-02-16 01:55:19 -05:00 |
|
|
kevinz000
|
14fdd90618
|
Nerfs public autolathes (#10970)
|
2020-02-16 07:37:24 +01:00 |
|