Commit Graph
2771 Commits
Author SHA1 Message Date
Gwydion Brain f1bdbaf375 medicalhypo initial 2a 2018-08-07 03:49:49 -07:00
Gwydion Brain 442b7320b8 medicalhypo initial 1A
+medivend_hypo icon state
=changes medical hypospray to use said sprite
=changes medical hypospray description to hopefully confuse security and traitors less.
2018-08-06 22:19:08 -07:00
Fox McCloud 3193d599cb Medical Hypospray 2018-08-02 23:39:15 -04:00
Kyep 8b5f59fe9d Merge remote-tracking branch 'ParadiseSS13/master' into make_meth_less_op 2018-07-29 17:07:42 -07:00
datlo f167c32424 Fixes pyrosium description 2018-07-29 18:42:30 +01:00
Kyep 3de3bb807e GOTTAGOFAST_METH 2018-07-26 12:48:13 -07:00
Kyep 4e3893dc00 renames GOTTAGOREALLYFAST to GOTTAGOFAST2 2018-07-26 12:44:55 -07:00
Aurorablade 1ebe3f908e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-07-23 18:21:04 -04:00
Crazy LemonandGitHub e48ab63bcc Merge pull request #9218 from Fox-McCloud/beesplosion
Adds Beesplosion Chemical Reaction
2018-07-21 21:11:33 -07:00
Fox McCloud 72309e4694 protection 2018-07-21 23:17:48 -04:00
Aurorablade 96a59a2b53 ups tank to 3000 2018-07-20 22:58:02 -04:00
Fox McCloud 7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Fox McCloud 9c3fcaa53c AGHHHHHHHHHHHHH 2018-07-17 02:13:52 -04:00
Fox McCloud bf8dd30a2a Adds Beesplosion Chemical Reaction 2018-07-16 22:16:57 -04:00
Aurorablade 38cf6c27c0 Oil tank, OIL TANK 2018-07-12 19:05:53 -04:00
Aurorablade c295d4da36 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-07-12 18:20:12 -04:00
Fox McCloud 9463807ac2 done 2018-07-09 05:45:01 -04:00
Anasari 6c8bba3f63 Merge branch 'master' into CryoLog 2018-06-26 16:24:29 +08:00
Kyepandtigercat2000 412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
2018-06-13 16:55:21 -07:00
tigercat2000andGitHub 70b1477133 Merge pull request #9070 from Fox-McCloud/plastic-surgery
Adds Plastic Surgery; Fixes Disfigurement
2018-06-13 13:20:00 -07:00
Ansari 0b0b1b7478 Make it so that spray displays coordinate of user (Instead of the spray which is always 0,0,0) 2018-06-07 22:33:27 +08:00
Fox McCloudandGitHub 482904befc Merge pull request #9086 from tigercat2000/spacemandmm_fixes
Macro Refactor for SpacemanDMM
2018-06-03 19:45:33 -04:00
Fox McCloud 7f2f766f70 Merge remote-tracking branch 'upstream/master' into attack-hulk
# Conflicts:
#	code/game/objects/structures/window.dm
2018-06-03 18:49:44 -04:00
tigercat2000 5ace5944d9 Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings 2018-05-31 19:34:47 -07:00
Fox McCloud b17d7ad335 Merge remote-tracking branch 'upstream/master' into plastic-surgery 2018-05-30 11:44:06 -04:00
Fox McCloud bbfe4f675e fix redundancy 2018-05-27 15:04:45 -04:00
Fox McCloud e9c4568c4f tweaks 2018-05-27 14:15:14 -04: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
Tayyyyyyy 42f85919de More their 2018-05-25 18:34:26 -07:00
tigercat2000andGitHub ea44afdebe Merge pull request #9025 from Anasari/BombToInvestigate
Move bombing list to investigate & improve bomb logging
2018-05-25 17:58:13 -07:00
tigercat2000andGitHub 5213d9b3e6 Merge pull request #9037 from Anasari/LubeCoord
Add coordinates to acid / lube spray message for administrative purpose
2018-05-25 17:55:25 -07:00
Fox McCloud a9be0490ee Adds Plastic Surgery; Fixes Disfigurement 2018-05-24 17:52:23 -04: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 a31583c7f3 More fixes 2018-05-20 17:07:43 +08:00
Fox McCloud 7c55ffb841 this was bad 2018-05-19 23:56:34 -04:00
Ansari 6fbfe6cd35 Fixes reagentlist so you are not locked to src and can use it to check something else's reagent list. It defaults to src. And make it so that your username is shown when putting stuffs in cryo 2018-05-19 20:13:45 +08:00
Ansari 10c34f4ce9 Remove two \the. Refactors reagentlist while at it so that its default argument is src 2018-05-19 18:45:14 +08:00
Fox McCloud fc7692cdce alien object damage system 2018-05-19 03:26:10 -04:00
Ansari dca636b3e5 Add coordinates to acid / lube spray message for administrative purpose 2018-05-19 11:11:43 +08:00
Ansari f619f85655 FixGrammar 2018-05-19 08:24:01 +08:00
Ansari ed0c209e93 Expand fuel tank logging 2018-05-18 16:39:57 +08:00
Fox McCloud 1a00cbdcf9 Actually Fixes Chem Smoke 2018-05-02 00:14:32 -04:00
Fox McCloud cd8c38bb40 Fixes Plastic Recipe 2018-04-29 20:54:18 -04:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud eafd57487c Merge remote-tracking branch 'upstream/master' into component-port
# Conflicts:
#	paradise.dme
2018-04-23 13:54:50 -04:00
Aurorablade 72a3c66cf5 IPC bleeding v2 2018-04-22 00:21:48 -04:00
Fox McCloud 32e3a25070 got it 2018-04-21 20:25:14 -04: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