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
timothyteakettle
e8fade4f7f
changes
2020-07-18 02:29:12 +01:00
silicons
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
Artur
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
Putnam
75c0b01c86
Updated to july 2020.
2020-07-08 23:13:26 -07: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
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
kevinz000
120826e1fc
Update tanks.dm
2020-06-10 14:47:58 -07:00
Ghom
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
Artur
b6dc41b852
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
shellspeed1
2002a273de
Makes empty internal tanks printable
2020-06-04 16:04:16 -07:00
Artur
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
Ghom
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
Artur
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
Trilbyspaceclone
b43a2861b6
Update watertank.dm ( #12283 )
2020-05-20 18:47:41 -07:00
Artur
dabdf16eac
Coonflict fiiixeeess
2020-05-13 12:56:17 +03:00
Artur
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
Putnam
8458f97692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-05-12 13:34:31 -07:00
Putnam
e8d7da56f4
Ported C++mos from yogs (help me)
2020-05-11 15:44:26 -07:00
Ghommie
b2a20d5438
reducing some prices as training wheel.
2020-05-03 05:37:04 +02:00
Ghommie
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
kevinz000
4689e2aeb6
Merge pull request #11980 from Ghommie/Ghommie-cit700
...
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Ghommie
94f014589d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-25 17:09:34 +02:00
Artur
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
Ghommie
63870cc9d1
Movespeed modifiers refactor port.
2020-04-22 22:01:39 +02:00
Ghommie
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
Ghommie
42ff9b1d35
Final test, fixes and parent calls.
2020-04-14 01:23:26 +02:00
Ghommie
2b4b626fac
support for items that switch states through update_icon.
2020-03-10 16:55:30 +01:00
Ghommie
5dc1de1d04
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-05 04:34:54 +01:00
Ghommie
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
Ghommie
84d9430ee4
PC too slow for compile.
2020-02-03 07:21:39 +01:00
Ghommie
81b5fe2de3
Further buff and fix for clown ops tearstache nade.
2020-02-03 07:08:47 +01:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
Artur
8b8a112d2c
Ohkay
2020-01-15 09:41:33 +02:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Lin
e5e2e4f012
Merge pull request #10329 from Ghommie/Ghommie-cit490
...
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
Ghommie
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
Ghommie
3fcb7808fd
args
2019-12-13 02:30:17 +01:00
Ghommie
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
Ghommie
cb74be29ae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262
2019-10-25 12:40:50 +02:00
Ghommie
a95b13c24a
jetpack fixes too & co
2019-10-23 19:31:54 +02:00
Ghommie
c882c098cc
Porting movespeed modification system updates.
2019-10-23 19:24:34 +02:00
Ghommie
e991328087
progress
2019-10-19 15:02:56 +02:00
Chayse Ramsay
f9d829b111
Proc to define
2019-08-04 05:48:08 +01:00
Chayse Ramsay
46e4023ba9
Monkey business
2019-08-04 05:07:24 +01:00
Chayse Ramsay
5055cd73b9
Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains.
...
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
2019-07-28 17:31:59 +01:00
Sishen
575f70f3b2
Update jetpack.dm
2019-06-30 01:13:37 -04:00
