Commit Graph

215 Commits

Author SHA1 Message Date
Fox McCloud
93118f9d34 Remaps Toxins 2019-04-11 07:24:16 -04:00
Mark van Alphen
69aa881c39 Flashbang fix 2019-04-11 05:32:54 +02:00
Fox McCloud
cbcc4aab45 Flash Powder, Sonic Powder, and Flashbang Refactor 2019-03-31 03:29:27 -04:00
joep van der velden
e83a7131cc Refactored pickup code and fixed the bug 2019-03-18 16:42:44 +01:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
datlo
d140b858ec Adds the oxygen grenade 2019-01-23 21:36:08 +00:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
Kyep
28ae61ee2c +talisman, -midgitSE, +cluster grenades, -goliathhide, +KAmodkit, +bartenderkit, +chefkit, -bananade 2019-01-10 17:24:55 -08:00
Ranged
550e2300f9 Fixed flashbang container interaction 2018-12-24 19:49:36 +01:00
datlo
6fe32ee6ae Add shrapnel to frag grenades 2018-12-19 07:49:05 +00:00
datlo
47664f404b frag grenades do not breach, have more radius 2018-12-18 04:12:09 +00:00
datlo
987a670b76 remove implied src, change beakers in facid grenades 2018-12-18 02:04:35 +00:00
datlo
d0ea5d0e97 fix facid grenade naming 2018-12-17 22:36:31 +00:00
datlo
3f2804c8bf adds the grenadier belt and permafrost'd tiles 2018-12-17 11:53:28 +00:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
tigercat2000
e56750481c Multilingualism
This commit adjusts the speech parsing system to allow for an infinite
number of languages to be present in the same message. You can
transition freely between any language you are able to speak simply by
putting it's language key in the middle of the sentence.

Honestly, this was a massive pain in the ass, and there's probably still
broken stuff, even though I've spent around 8 hours testing and refining
this.
2018-11-24 00:22:05 -08:00
AzuleUtama
8ad25400ea Fixes description text errors in booger cocktail and in feral cat grenade
Slightly changed text of booger cocktail's description to stop it creating a hyperlink in the chat window that went nowhere.  Updated feral cat grenades stating they spawned 8 cats in the uplink and item description when they actually spawn 5.
2018-11-11 19:13:53 +00:00
tigercat2000
ab032b6737 SSoverlays for human icons, mostly works
Closer to working 100%

But legitimately /tg/ icons

Move lighting to it's own plane, fix observers

Fix humans layering over other objects incorrectly

Nyaaaaa~
2018-11-08 20:24:22 -08:00
variableundefined
152a350538 Deconflict 2018-10-19 16:07:04 +08:00
variableundefined
309e3b04f6 Clears up some relative pathing part 1 2018-10-10 23:39:34 +08:00
Mars
4fa906951a Use of the flexible macro
Mostly regex to catch every \ref with the same formatting, with their
reference and display name.
2018-08-16 20:04:53 +02:00
Mars
b5b09b435c No hard-coded format in the macros anymore 2018-08-16 11:51:52 +02:00
Mars
e8d92b3ced More flexible macro 2018-08-16 11:37:03 +02:00
Mars
4d3c3b29e4 Quick Regex replace action
Used Regex to replace all hrefs with \ref and the same displayed text
with the corresponding UID macros
2018-08-15 23:57:46 +02:00
Kyep
4d4eb16a3a fixes merge conflict 2018-06-06 16:32:31 -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
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
cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04: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
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04: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
Kyep
1b6b1deecc fixes merge conflict in custom_grenades.dm 2018-04-01 18:59:25 -07:00
tigercat2000
e67ba4ecd8 Merge pull request #8503 from Kyep/frikin_laser_beams
Fixes #6229 - tripwire mines not working / brings back frikin' laser beams
2018-04-01 18:47:31 -07:00
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
Kyep
5f2ef09a13 fixes merge conflict with bureaucracy.dmi 2018-03-01 19:12:10 -08:00
tigercat2000
ff06bf8854 Merge pull request #8430 from Fox-McCloud/ied-buff
Buffs IEDs
2018-02-19 21:45:05 -08:00
Tayyyyyyy
460cada461 Add light to flashbangs 2018-01-23 15:32:04 -06:00
Kyep
20e2fc2db1 Merge remote-tracking branch 'ParadiseSS13/master' into depot 2018-01-05 03:25:18 -08:00
Kyep
3c8d8c0c00 more 2018-01-02 19:53:57 -08:00
Kyep
40c1200403 Fixes #6229 - tripwire mines not working 2018-01-01 17:50:32 -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
Fox-McCloud
5f918ceb07 Buffs IEDs 2017-12-05 02:19:17 -05:00
uraniummeltdown
7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown
a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
Ansari
7b4ce9922f Add logging for chem reagents when nade are primed 2017-10-10 18:52:56 +08:00