Commit Graph

879 Commits

Author SHA1 Message Date
silicons
d25daec117 Merge pull request #13081 from Putnam3145/ethereals
Ports ethereals from TG
2020-08-09 05:39:43 -07:00
silicons
3acd4ac6de Merge pull request #13069 from Chiirno/radioactive-port
Ports TG #51879 - Makes rads glow, buffs rad goggles
2020-08-09 05:35:08 -07:00
Lin
dea2dab536 Merge pull request #13055 from Citadel-Station-13/silicons-patch-78
squeaking objects including air horns and clockwork boots now have a default 1 second cooldown. squeaking objects crossing each other will on average only allow 3 squeaks to occur, because if byond is literally running out of sound channels you know the fun has went too far
2020-08-08 12:06:42 -05:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Lynxless
14e35806b9 I hope this works 2020-08-07 16:23:15 -03:00
silicons
36bdb9e482 Update twohanded.dm 2020-08-07 01:31:29 -07:00
silicons
94fa7e4fbb Update squeak.dm 2020-08-07 01:06:23 -07:00
silicons
95607274e3 Update twohanded.dm 2020-08-07 00:19:02 -07:00
silicons
b80fe7013e Update twohanded.dm 2020-08-07 00:17:12 -07:00
silicons
23880e284a Update squeak.dm 2020-08-06 21:48:01 -07:00
silicons
79313209c3 Update squeak.dm 2020-08-06 21:42:13 -07:00
silicons
29228a9df4 Update squeak.dm 2020-08-06 21:36:53 -07:00
silicons
a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
2020-08-03 14:43:07 -07:00
Lin
2885b861f2 Merge pull request #12954 from silicons/killer_queen
bomb stands now use components
2020-08-02 12:52:07 -05:00
Timothy Teakettle
289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
silicons
25d1fb761a Merge remote-tracking branch 'citadel/master' into killer_queen 2020-08-01 20:51:38 -07:00
silicons
e8ec73ba7d Merge pull request #12976 from Hatterhat/durathread-kits
Durathread Reinforcement Kits
2020-08-01 03:35:45 -07:00
silicons
30d82d66d1 Merge pull request #12939 from Sishen1542/iaa-iaa
Reflavors IAA, removes certain items from IAA uplinks, adds TC stealing functionality to uplinks
2020-08-01 02:24:01 -07:00
Hatterhat
6dfdff34ef durathread armor kits 2020-07-30 13:38:04 -05:00
Sishen
7fa5ccbd0e fixes slapping uplinks with non uplink items giving runtimes 2020-07-29 16:14:01 -06:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons
c87c2bd850 smh 2020-07-28 12:31:35 -07:00
silicons
78b6a60e80 oh 2020-07-28 12:25:27 -07:00
silicons
fd738fd16a spelling 2020-07-28 12:12:30 -07:00
silicons
c720e800df whew! 2020-07-28 12:08:02 -07:00
Hatterhat
8a32cac8db window rotation fix 2020-07-28 10:47:07 -05:00
Sishen
27aba092e0 aaaaaaaaaa 2020-07-27 08:20:03 -06:00
timothyteakettle
3467bf3515 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-07-26 00:25:26 +01:00
timothyteakettle
b708be60e9 hey look ma i removed a space 2020-07-25 02:12:21 +01:00
timothyteakettle
2a3f45f7af fixes 2020-07-25 01:10:12 +01:00
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Iatots
e6dd213a2a Update recipes_misc.dm 2020-07-23 20:26:11 +02:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
Timothy Teakettle
b06948bed4 fry smite 2020-07-20 17:48:37 +01:00
Timothy Teakettle
a0c166c490 badmin safeguarding 2020-07-20 17:43:58 +01:00
Timothy Teakettle
c68f0559d9 old instant eating speed 2020-07-20 17:29:09 +01:00
timothyteakettle
e2b68797b7 bugfixes 2020-07-20 00:49:00 +01:00
timothyteakettle
8709a72fc0 fry everything 2020-07-20 00:40:18 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Putnam
d88ade40bf actually fixes uplink 2020-07-18 01:51:59 -07:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
Letter N
819ca63456 https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing 2020-07-16 20:42:02 +08:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03: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
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Artur
7ebc785437 fIXES UPLINK 2020-07-05 21:52:24 +03:00
Ghom
17ee8c5960 Merge pull request #12660 from YakumoChen/master
Reverts improv small arms, makes guncrafting easier and faster
2020-07-04 18:35:22 +02:00
silicons
103b8b7600 Merge pull request #12662 from kappa-sama/patch-29
makes bows and arrows more feasible improv weapons
2020-07-04 00:11:45 -07:00