silicons
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Putnam
e89e7adda4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments
2020-09-21 03:31:35 -07:00
silicons
95ebeac5b6
fix
2020-09-15 17:27:11 -07:00
Putnam
f13af9f72e
Made gases only display in analyzers if they have at least 0.005 moles.
2020-09-14 02:37:47 -07:00
Timothy Teakettle
f1cd94fc97
emp rework
2020-09-09 23:14:06 +01:00
BlackMajor
1943a2fdd7
Merge pull request #13246 from silicons/anomaly_manufacturing
...
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
2020-09-06 17:53:35 +12:00
Putnam
9da959795c
Made the text make sense, again.
2020-08-30 05:42:21 -07:00
Putnam
15b5b77494
Replaced all the references of fusionpower to instability in results.
2020-08-30 03:06:36 -07:00
Putnam
5ba883bfe5
Fixes fusion power text to make sense.
2020-08-30 02:53:46 -07:00
silicons
9250a6d71d
Merge pull request #13275 from Chiirno/portable-chem-mixer
...
Portable chem mixer
2020-08-29 21:34:57 -07:00
Letter N
fe17bee28e
reverts thing kev said about
2020-08-29 14:36:41 +08:00
Chiirno
2df4bedb06
All the errors deleted away
2020-08-27 14:44:19 -03:00
Chiirno
fdc2cea077
added chem dispenser, time for errors
2020-08-27 14:27:35 -03:00
silicons
bd5766a8be
changes
2020-08-23 05:27:53 -07:00
Letter N
3b7bca28b3
Functional* code
2020-08-20 13:50:33 +08:00
silicons
05290c85f3
Merge pull request #13094 from Hatterhat/tc-theft-patch
...
PDA Uplinks Can Now Siphon Pens
2020-08-10 02:30:11 -07:00
Hatterhat
197e426432
heho funny uplink thefties
2020-08-08 23:54:31 -05:00
Letter N
cc98f50eb6
what if slabs still show things even if ratvar is free? Does not fix "the sleeper" though
2020-08-07 11:25:36 +08:00
Letter N
f2f6416105
fixes - radio, broken - crewmanifest, gastank controler
2020-08-05 20:34:09 +08:00
Letter N
454baea55f
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-04 09:31:34 +08:00
Letter N
a19e306137
less redtext - updates anomalies
2020-08-03 20:53:36 +08:00
Letter N
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
silicons
90d3cff53f
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 11:53:59 -07:00
silicons
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
silicons
9ff94e019b
Merge pull request #12924 from SiliconMain/analyzer
...
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
SiliconMain
e11dab552f
it just werks
2020-07-26 16:28:21 -05:00
SiliconMain
fdaa4b4372
aaaaaaaaaaa
2020-07-26 16:07:48 -05:00
SiliconMain
ad420c6633
AAAAAAAAAAAA
2020-07-26 15:53:08 -05:00
SiliconMain
abdafe15fa
fuck
2020-07-26 15:21:24 -05:00
Letter N
8e177bf01e
another batch - MAJOR: teleportaiton, displaycase (ico port needed),
2020-07-24 19:58:48 +08:00
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
silicons
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
silicons
f3efa19436
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-21 11:25:26 -07:00
Timothy Teakettle
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
silicons
9bb92f8d4d
Merge pull request #12805 from SiliconMain/patch-1
...
This is stupid
2020-07-20 16:56:57 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
silicons
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
silicons
1a040dd2a6
changes
2020-07-18 18:44:17 -07:00
silicons
7c5d4f863d
click cd breakout
2020-07-18 18:10:21 -07:00
Timothy Teakettle
1a5008fee7
Merge branch 'master' into wound-port
2020-07-18 23:06:49 +01:00
Timothy Teakettle
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
Timothy Teakettle
93b4570f8d
more changes
2020-07-17 23:23:47 +01:00
SiliconMain
82e0a3b66b
Update geiger_counter.dm
2020-07-17 14:32:46 -05:00
silicons
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
timothyteakettle
584e74590f
port1
2020-07-17 02:01:33 +01:00
Artur
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
Keate Senior
80b4c03c82
Initial changes to get this to github for public reviewing
...
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
2020-07-12 00:43:54 -04:00
Putnam
a625d6562b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-07-08 22:02:03 -07:00
silicons
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
Artur
6c4e733a38
More testmerge fixes
2020-07-03 15:16:02 +03:00
