Commit Graph

2238 Commits

Author SHA1 Message Date
tigercat2000
49ef4be0e6 Merge pull request #9051 from Anasari/ConfirmationPossess
Add confirmation prompt to possess object
2018-06-13 13:27:11 -07:00
tigercat2000
2d9d4d51e1 Merge pull request #9002 from Kyep/ds_fix
DS / prefs fix
2018-06-08 11:59:05 -07:00
tigercat2000
b9a6383188 Merge remote-tracking branch 'upstream/master' into tcomms_optimize
# Conflicts:
#	code/game/machinery/telecomms/telecomunications.dm
2018-06-07 15:04:57 -07:00
uraniummeltdown
75bded82cf added defines for window construction states and full window diagonal dir
added a proc to check for valid window location, added var/fulltile to windows instead of using a proc
added clockwork windoors and windows to brass recipes
added titanium glass and plastitanium glass, made glass types use recipes like other stacks, you can smelt the new glasses in the ORM
removed force from RCD and added NOBLUDGEON flag, fixing a bug where you couldn't deconstruct airlocks with an RCD
slight nerf to wielded fireaxe, does high damage to windows and grilles instead of insta-deleting them
deleted fullwindow.dm and moved windows to window.dm
added some feedback to placing glass on grilles
examining windoor assembly shows you can rotate it, examining windows show deconstruction hints and rotation
added cracks to windows, you can repair windows using a welding tool on help intent, slight buff to window health
added var/cancolor to windows and blacklists some windows from being auto-colored, window shards also get colored on narsie_act()
full windows now use icon smoothing system, windows now use the obj_integrity damage system
added is_glass_sheet() helper
2018-06-03 13:11:37 +04:00
tigercat2000
baf5fe64a7 Merge pull request #8967 from Tayyyyyyy/pronouns
Pronouns!
2018-05-25 19:39:11 -07:00
tigercat2000
9e54ca5dc2 Merge pull request #9054 from Tayyyyyyy/ticket_bleed_fix
Fix ticket bleed
2018-05-25 19:33:31 -07:00
Tayyyyyyy
50aceae04d Revert unwanted style change 2018-05-25 19:02:13 -07:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy
dd120a00f0 Their 2018-05-25 18:34:24 -07:00
Tayyyyyyy
170266d827 More pronouns 2018-05-25 18:34:23 -07:00
Ansari
f381b7516c Early return. 2018-05-26 09:09:41 +08:00
tigercat2000
292f375105 Merge pull request #9033 from Tayyyyyyy/amoji
Enable emojis for asay and msay 🎉
2018-05-25 18:06:00 -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
Birdtalon
5bbe1f7342 fixes annoying typo on permanent ban 2018-05-22 12:00:56 +01:00
Tayyyyyyy
2e242bfc84 Fix ticket bleed 2018-05-21 17:40:05 -07:00
Ansari
0d1ad7c1a7 Add confirmation prompt to possess object 2018-05-21 16:26:50 +08:00
Tayyyyyyy
3e26a6b5f3 Enable emojis for asay and msay 2018-05-18 00:25:28 -07: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
Kyep
67be17f7f3 fixes merge conflict 2018-05-15 19:30:27 -07:00
Fox McCloud
5df7dfdaac Preps the Way for Datumized Antags 2018-05-15 21:55:44 -04:00
Fox McCloud
042ee7b77b comments 2018-05-14 20:40:39 -04:00
Fox McCloud
f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
Kyep
213704c3ef more safety 2018-05-09 20:11:28 -07:00
Kyep
6438c55ae2 fixup 2018-05-09 19:55:20 -07:00
Kyep
49c8304573 standardization 2018-05-09 19:49:18 -07:00
Kyep
e1cfc14799 refactor 2018-05-09 19:39:57 -07:00
Kyep
a44060da13 fixup 2018-05-09 19:13:26 -07:00
Kyep
631e7bee35 DS / prefs fix 2018-05-09 19:08:07 -07:00
Fox McCloud
7d4fb45509 Merge pull request #8947 from tigercat2000/more_ss_ports
SS Conversion: Atoms, Machines, n' Mobs
2018-05-07 17:54:49 -04:00
Kyep
05e0901967 removes anti-drop implants 2018-05-04 18:36:56 -07: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
Kyep
682b9aaaf3 fixes merge conflict 2018-04-25 23:36:39 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Tayyyyyyy
12aea54e84 Fix PM box revealing admin char, incorrect PM target for non-admins 2018-04-25 01:53:11 -05:00
Tayyyyyyy
854422565c Hide PM mob name from non-admins 2018-04-23 18:19:28 -05:00
Tayyyyyyy
e09bfc27c9 Fix PM type being wrong 2018-04-23 00:19:39 -05:00
tigercat2000
a2507f589d Rust-G integration. Makes logging procs 2-3 times less expensive (EVEN WITH CALL OVERHEAD). tgstation/tgstation#36858 2018-04-19 15:08:59 -08: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
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
tigercat2000
bee011cb05 Merge pull request #8789 from MarsM0nd/manned_up
Man up changes
2018-04-13 15:43:14 -07:00
Mars
fe7991da68 Revert man up message change 2018-04-13 13:27:26 +02:00
Kyep
d714ec1635 reverts DS jumpsuits, black -> green 2018-04-07 13:54:17 -07:00
tigercat2000
c3c6c9caba More optimizing 2018-04-05 15:29:08 -07:00
Fox McCloud
1d80bf01c0 Merge remote-tracking branch 'upstream/master' into gc-ss-port
# Conflicts:
#	paradise.dme
2018-04-03 18:21:04 -04:00
tigercat2000
e71c4279a7 Merge remote-tracking branch 'upstream/master' into night_shift
# Conflicts:
#	paradise.dme
2018-03-30 10:20:21 -07:00
Fox McCloud
4bbb854372 last tweaks 2018-03-29 01:21:17 -04:00
Fox McCloud
7f842e3223 no more runtimes 2018-03-29 00:44:53 -04:00
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
Fox McCloud
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00