Commit Graph

4378 Commits

Author SHA1 Message Date
Tayyyyyyy
98c6ddf5a7 Fix his, he, him 2018-05-25 18:34:28 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy
dd120a00f0 Their 2018-05-25 18:34:24 -07:00
Tayyyyyyy
c80704e724 Conjugating verbs is hard 2018-05-25 18:34:23 -07:00
Tayyyyyyy
170266d827 More pronouns 2018-05-25 18:34:23 -07:00
Tayyyyyyy
ad0da70305 Punches 2018-05-25 18:34:22 -07:00
Tayyyyyyy
497072d4d1 Update pronoun usage 2018-05-25 18:34:22 -07:00
tigercat2000
ea44afdebe Merge pull request #9025 from Anasari/BombToInvestigate
Move bombing list to investigate & improve bomb logging
2018-05-25 17:58:13 -07:00
Ansari
827503b0a4 EMP now provide coordinates and allow you to jump to it. Most EMP instance except for the Experimentor and the Singularity are now logged. 2018-05-23 18:33:12 +08:00
Ansari
dd417c006b Uses define instead of "bombs" for styling reason. Fixes IED not logging into investigate due to its special mechanism. 2018-05-18 12:23:08 +08:00
tigercat2000
1cfc3f27c8 Merge pull request #8974 from Fox-McCloud/holo-projector
Ports Holoprojectors
2018-05-17 20:19:13 -07:00
Ansari
792f3ada27 Fixes spacing 2018-05-18 07:05:05 +08:00
Ansari
2e870f8038 Remove all instance of bombers. Replace "bomber list" in secrets with "bombs" in investigate. Remove useless clear bomb function. 2018-05-17 23:14:29 +08:00
Crazy Lemon
63ec546a0a Merge pull request #9008 from Fox-McCloud/remove-mode
Removes All Modes
2018-05-14 17:49:58 -07:00
Fox McCloud
b3524505b5 tweak 2018-05-14 17:51:13 -04:00
Fox McCloud
f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
tigercat2000
254cdd6055 Merge pull request #8972 from Fox-McCloud/power-cell
Power Cell Code Cleanup
2018-05-09 11:26:03 -07:00
Fox McCloud
8845262d65 Merge remote-tracking branch 'upstream/master' into holo-projector
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	paradise.dme
2018-05-04 16:37:24 -04:00
tigercat2000
8071b42308 Merge remote-tracking branch 'upstream/master' into more_ss_ports
# Conflicts:
#	code/modules/food_and_drinks/food/snacks.dm
2018-05-03 19:30:41 -07:00
Fox McCloud
8bd042240f Power Cell Code Cleanup 2018-05-02 19:35:18 -04:00
tigercat2000
0c6cbbc5c3 Merge pull request #8959 from Fox-McCloud/remove-things
Removes Programmable Unloaders and a Few Unused Files
2018-05-01 14:07:12 -07:00
tigercat2000
7fb8f8d76c Merge remote-tracking branch 'upstream/master' into more_ss_ports
# Conflicts:
#	paradise.dme
2018-04-30 09:27:11 -07:00
Fox McCloud
e649a72923 Emptying Stop-gap 2018-04-30 03:53:49 -04:00
Fox McCloud
ee6a156ca2 Removes Programmable Unloaders and a Few Unused Files 2018-04-30 00:41:26 -04:00
Fox McCloud
b394cf3624 Ports Holoprojectors 2018-04-30 00:24:46 -04:00
tigercat2000
7d8c9a731a SS Conversion: Atoms, Machines, n' Mobs
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
Fox McCloud
cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000
e086908c44 Merge pull request #8897 from Fox-McCloud/adds-frame
Adds F.R.A.M.E. Cartridge
2018-04-25 18:57:29 -07:00
Fox McCloud
4243947e7a tweak 2018-04-25 21:48:44 -04:00
tigercat2000
3bf0f18b52 Merge pull request #8916 from Tayyyyyyy/soap_qol
Soap QOL
2018-04-25 16:16:14 -07:00
tigercat2000
ad24d3a584 Merge pull request #8901 from Fox-McCloud/component-port
Ports TG Components and R&D Tweaks
2018-04-24 19:01:49 -07:00
tigercat2000
5b68c2189c Merge pull request #8918 from Fox-McCloud/fluff-spawn-fix
Fixes Random Plushie Spawning
2018-04-24 18:09:11 -07:00
Fox McCloud
9860cf996e Fixes Random Plushie Spawning 2018-04-24 21:02:07 -04:00
Tayyyyyyy
8ecd9dd480 Fix coding style 2018-04-24 16:40:59 -05:00
Tayyyyyyy
ef20a187c0 Reduce soap clicks 2018-04-24 16:28:22 -05:00
Fox McCloud
eafd57487c Merge remote-tracking branch 'upstream/master' into component-port
# Conflicts:
#	paradise.dme
2018-04-23 13:54:50 -04:00
Fox McCloud
32e3a25070 got it 2018-04-21 20:25:14 -04:00
Fox McCloud
0382afcb33 Ports TG Components 2018-04-21 01:22:50 -04:00
Fox McCloud
25d331b0bb tweak 2018-04-19 21:14:00 -04:00
Fox McCloud
0f28456db3 Adds F.R.A.M.E. Cartridge 2018-04-19 20:54:59 -04:00
tigercat2000
2364b0332b Convert a bunch of name/(ckey) to key_name + ISO-8601 timestamps 2018-04-19 15:08:59 -08:00
tigercat2000
c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
Fox McCloud
2b25584372 Merge remote-tracking branch 'upstream/master' into remove-weapons 2018-04-19 17:01:38 -04:00
MINIMAN10000
ad53317db1 Merge Conflict Resolved 2018-04-17 11:24:50 -07:00
tigercat2000
17fd8e8a6a Merge pull request #8819 from Kyep/syndi_outfit_boots
Improves admin outfits, fixes magboots, adds special antags
2018-04-16 18:28:03 -07:00
tigercat2000
66d4b79222 Merge pull request #8891 from MINIMAN10000/nobludgeon-remotes
Adds nobludgeon to door remotes so they always work on doors
2018-04-16 18:23:31 -07:00
tigercat2000
a9f4022fa8 Merge pull request #8874 from MINIMAN10000/cable-coil
Cable coils can transfer part of a stack
2018-04-16 18:12:14 -07:00
MINIMAN10000
2f873143ed Adds nobludgeon to door remotes making the remote always operate on the door 2018-04-16 17:56:35 -07:00
Fox McCloud
b3fa91030b oops 2018-04-15 22:41:42 -04:00