Fox McCloud
ed9915edd9
Merge remote-tracking branch 'upstream/master' into two-handed
...
# Conflicts:
# code/game/objects/items/weapons/twohanded.dm
2018-05-26 19:05:17 -04:00
Tayyyyyyy
bc977804de
Small fixes
2018-05-25 18:39:38 -07:00
Tayyyyyyy
919bd7aaf2
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
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 and GitHub
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 and GitHub
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
Fox McCloud
66ee8fa0b6
spelling
2018-05-14 21:47:23 -04:00
Crazy Lemon and GitHub
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
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
Fox McCloud
8bd042240f
Power Cell Code Cleanup
2018-05-02 19:35:18 -04:00
Fox McCloud
70c3fb81a6
Buffs DIY Chainsaw
2018-05-02 18:05:39 -04:00
tigercat2000 and GitHub
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
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
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 and GitHub
3bf0f18b52
Merge pull request #8916 from Tayyyyyyy/soap_qol
...
Soap QOL
2018-04-25 16:16:14 -07: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
0382afcb33
Ports TG Components
2018-04-21 01:22:50 -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 and GitHub
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
Fox McCloud
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
MINIMAN10000
f023edefa7
Crayons color cables, cableColor now cable_color
2018-04-14 23:54:37 -07:00
Fox McCloud and GitHub
6a02689398
Merge pull request #8726 from shazbot194/Major_Tom
...
Major tom
2018-04-14 23:58:19 -04:00
shazbot194
1747f9e31e
Small code improvements and description reverts
2018-04-14 17:25:56 -08:00
CoreyLee Hassell
5cef36efdf
Changed defib timer from 3 minutes to 5 minutes
2018-04-12 18:39:54 -04:00
Kyep
2cb4e1f75c
Fox requests
2018-04-08 08:03:34 -07:00
Fox McCloud
196d0b90f9
Makes Records GC (most of the time)
2018-04-07 23:38:10 -04:00
Kyep
ca8bb33a58
Tiger requests
2018-04-07 14:01:48 -07:00
tigercat2000 and GitHub
a7b6e00bd3
Merge pull request #8853 from Dyhr/master
...
Agent ID occupation options
2018-04-06 20:54:43 -07:00
tigercat2000 and GitHub
57a4be2138
Merge pull request #8794 from Birdtalon/fixes
...
Fixes and tweaks
2018-04-06 20:02:07 -07:00
tigercat2000 and GitHub
413832ee27
Merge pull request #8837 from Kyep/better_demotions
...
Better ID computer logging
2018-04-06 20:01:38 -07:00
Fox McCloud