kevinz000
139508a9a4
Update drag_drop.dm
2020-02-17 22:36:57 -07:00
kevinz000
481f038e01
Update item_attack.dm
2020-02-13 05:40:36 -07:00
kevinz000
863ce5152b
Merge remote-tracking branch 'citadel/master' into stuff
2020-02-13 04:14:44 -07:00
kevinz000
a8a071851a
s
2020-02-13 00:32:26 -07:00
kevinz000
01390fa0e0
Merge remote-tracking branch 'citadel/master' into attack_chain
2020-02-10 04:18:02 -07:00
kevinz000
18910a23a2
Merge pull request #10881 from Ghommie/Ghommie-cit552
...
Refactoring mob holders into an element.
2020-02-06 00:41:28 -07:00
Ghommie
63c8612ccd
Refactoring mob holders into an element.
2020-02-04 01:42:59 +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
Artur
e7ddfdd8d8
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
Artur
8bb0e30036
Initial Commit V3
2020-01-31 18:17:14 +01:00
Arturlang
83ce84cdc4
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
kevinz000
28697a375f
Update item_attack.dm
2020-01-27 17:43:21 -07:00
kevinz000
e50eb495df
pre attack refactor
2020-01-27 16:30:23 -07:00
Ghommie
721fd108f9
A few more, ported, runtime fixes.
2020-01-24 03:02:07 +01:00
Artur
f5ad854c2c
Conflict fix
2020-01-20 13:50:52 +02:00
Putnam
d29603ad77
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
2020-01-15 15:57:32 -08: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
Putnam
d75a525b3c
let's fix arousal huh
2020-01-05 19:10:48 -08:00
Lin
b651bbcdb3
Merge branch 'master' into Ghommie-cit367
2019-12-31 22:37:59 +00:00
Ghom
93e090d229
Merge pull request #10309 from Seris02/disablerglasses
...
disabler sechuds, let the adminbus commence
2019-12-31 14:43:39 +01:00
Ghommie
edd05cebea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-12-30 00:28:36 +01:00
Seris02
f6caff8227
hnnnnnng code improvements
2019-12-29 20:10:15 +08:00
Seris02
0b6242e25d
let the adminbus commence
2019-12-28 00:40:55 +08:00
Ghommie
e1949b0131
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-12-23 19:02:20 +01:00
Ghommie
395457f7ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
2019-12-21 17:59:32 +01:00
Linzolle
70e50e57cd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-17 20:21:49 -06:00
Putnam3145
670141edf7
Merge pull request #10209 from Ghommie/Ghommie-cit470
...
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-17 11:26:36 -08:00
Ghommie
80402a0d88
Ports some hud and update_icon code updates.
2019-12-16 23:29:20 +01:00
Ghommie
447f416ca6
Merge branch 'Ghommie-cit470' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit471
2019-12-16 19:10:07 +01:00
Ghommie
93fbc17428
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-16 17:58:50 +01:00
Useroth
8151a1f3ff
Merged master into this branch.
2019-12-16 12:06:30 +01:00
Putnam3145
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
Ghommie
414d4b7a90
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
2019-12-09 00:04:22 +01:00
Linzolle
1e2a4f606c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-08 14:17:00 -06:00
Artur
9773b530f8
More fixes. Urgh
2019-12-08 21:47:25 +02:00
Useroth
5e836c51e4
Forgot to track the new files
2019-12-08 14:05:05 +01:00
Useroth
a37f2de71d
First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs.
2019-12-08 14:00:08 +01:00
Artur
4711eb0987
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-07 15:53:11 +02:00
Linzolle
19b004edab
update butchering
2019-12-01 14:35:11 -06:00
Artur
02048ce009
Bludsuckers
2019-11-29 21:28:14 +02:00
Ghommie
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
Ghommie
af0110db40
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-11-27 21:16:20 +01:00
Linzolle
cc54e5230f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-25 21:01:25 -06:00
BlackMajor
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
GrayRachnid
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
Ghommie
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
Ghommie
b560ff8284
refactoring code to allow all living mobs to use shields.
2019-11-17 06:23:12 +01:00
Lin
6aa6eaafe6
Merge branch 'master' into abductor-update
2019-11-15 23:24:51 +00:00
