Commit Graph

546 Commits

Author SHA1 Message Date
Kyep
9660aac6d2 fix docs, change timing 2018-06-17 21:39:17 -07:00
Citinited
b43ffe380f Removes unused var; deletes blank paper once cooked 2018-06-09 22:54:22 +01:00
Kyep
4d4eb16a3a fixes merge conflict 2018-06-06 16:32:31 -07:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Fox McCloud
66dd09ea4f arbitrary 2018-05-20 05:58:14 -04:00
Ansari
2152325076 Uses define instead of string 2018-05-18 11:37:22 +08:00
Ansari
de62acadf4 Add labeler to investigate logs 2018-05-17 18:27:11 +08:00
tigercat2000
28c0302fb4 Merge pull request #8991 from RyanSmake/fuckingfaxes
Fax machines are no longer photocopiers
2018-05-09 11:23:29 -07:00
ryansmake
f1a71a02fc Fax machines are no longer photocopiers 2018-05-07 22:04:36 +02: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
c3f271449e fixes merge conflicts with weapon removals 2018-04-26 00:09:18 -07:00
Kyep
08fdc2bce3 merge conflict fix 2018-04-25 23:48:44 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Citinited
452e2b723a fortune cookies aren't weapons silly 2018-04-20 19:41:57 +01:00
Citinited
5f53fc25fe Merge branch 'master' into put-that-cookie-down 2018-04-20 19:37:09 +01: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
Citinited
434a23d016 p tag instead of span tag 2018-04-15 21:33:38 +01:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Citinited
b66c700a63 tigercat & falseincarnate code suggestions 2018-04-14 16:40:25 +01:00
Citinited
1c8740ca93 Merge branch 'master' into put-that-cookie-down 2018-04-14 01:21:24 +01:00
Citinited
b60eb67202 Adds fortunes to fortune cookies 2018-04-14 01:06:11 +01:00
Citinited
19f684d1b7 Allows paper to have variably-sized window 2018-04-14 00:43:40 +01:00
tigercat2000
6743a6136c Merge pull request #8777 from MarsM0nd/admin_fax
Fax machine changes
2018-04-06 20:33:07 -07:00
Kyep
1b6b1deecc fixes merge conflict in custom_grenades.dm 2018-04-01 18:59:25 -07: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
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
tigercat2000
bc4fb3d79b Nightshifts & Randomized Station Time
This commit adds the Nightshift lighting mode from /tg/. From 19:00 to
07:00 in station time, the station will go into a reduced-lighting mode,
with dimmed lights across the station.

In conjunction with this, there is a new configuration option to start
the shift time at a random time other than 12:00, so that players are
more likely to experience a night shift (as opposed to having to have a
7 hour round).
2018-03-25 23:01:04 -07:00
Mars
a83b802392 Better spacing 2018-03-22 09:55:48 +01:00
Mars
8fe94f3c3e Stops unset departments from being a department for faxes.
Blocks the standard "Unknown" department from being assigned as a
department, and allows updating the departments to the list when wanted
per proc-call, without needing to call New()
2018-03-19 16:20:01 +01:00
Mars
c98f303a89 Makes physical admin fax machines possible
If there is a fax machine that's named like one of the admin
departments, which require mapping/admin varedits, it will also recive
the faxes send to admins.
2018-03-19 16:11:56 +01:00
Tad Hardesty
1ca410b91e Fix various syntactic problems 2018-03-06 23:19:39 -08:00
Kyep
5f2ef09a13 fixes merge conflict with bureaucracy.dmi 2018-03-01 19:12:10 -08:00
Fox McCloud
d028ad1ee9 Merge pull request #8314 from Anasari/FireFight
Port Paper Plane
2018-02-20 21:12:21 -05:00
Ansari
1e0a4645db fix 2018-02-21 08:28:26 +08:00
Ansari
0acc32b103 Finally 2018-02-20 19:47:09 +08:00
Ansari
b3968ce180 woops 2018-02-20 16:11:42 +08:00
Ansari
bcdc6af7f1 Fixes 2018-02-20 16:08:49 +08:00
Birdtalon
5e81b2f79f updates helper tooltip 2018-02-09 12:25:13 +00:00
Ansari
b6dae90f89 Fixes some problems, etc. 2018-02-03 12:35:42 +08:00
Tayyyyyyy
5f2149d911 Add glow to edagger 2018-01-22 19:02:20 -06:00
Kyep
20e2fc2db1 Merge remote-tracking branch 'ParadiseSS13/master' into depot 2018-01-05 03:25:18 -08:00
Kyep
7b792705dd yet more 2018-01-04 04:26:53 -08:00
Kyep
3c8d8c0c00 more 2018-01-02 19:53:57 -08:00
uraniummeltdown
75e177b7a9 renames receive_damage() for animations to receiving_damage()
renames take_damage() for organs to receive_damage()
renames Deconstruct() to deconstruct() for atmos objects
obj_integrity, max_integrity, integrity_failure vars moved to /obj level, obj_integrity = max_integrity on New()
2017-12-28 00:32:54 +05:00
Ansari
fd734cd16c Ensure the pronoun refer to the user instead of the plane. Remove verb. 2017-11-14 10:53:01 +08:00
Ansari
b194416d78 Add in a verb for folding plane. Add in check for the paperplane being in the user's hand. Ensure alt-click will work properly with paper on floor. 2017-10-31 10:24:07 +08:00
Ansari
73127ad74e Formatting fix second go, squashed two commits together 2017-10-29 08:59:48 +08:00
Ansari
1176587bce Fix formatting without actually breaking the file. 2017-10-28 08:13:42 +08:00
Ansari
40f8214361 Fix an oops and remove an unused icon 2017-10-26 20:03:06 +08:00