Commit Graph

479 Commits

Author SHA1 Message Date
Crazy Lemon
63ec546a0a Merge pull request #9008 from Fox-McCloud/remove-mode
Removes All Modes
2018-05-14 17:49:58 -07:00
Fox McCloud
f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
Tayyyyyyy
6f63e8b4b9 Fix Aurora Caelus spelling and grammar. Fixes #8945 2018-05-09 19:03:49 -05:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000
8c1e61f63f Adds the aurora caelus event, the space equivelent of the northern lights. 2018-04-22 21:10:45 -07:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud
b659a1d9a1 Merge pull request #8678 from Kyep/ts_tunneler
Terror Spider Update, Brown Terrors
2018-04-08 01:38:34 -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
Fox McCloud
b61766fbc5 Merge pull request #8812 from tigercat2000/night_shift
Nightshifts & Randomized Station Time
2018-04-03 18:09:09 -04:00
Fox McCloud
c22025abfa Fixes Unkillable Spacevines 2018-04-03 00:08:56 -04:00
Kyep
d8677acc58 fixes merge conflict in prince.dm 2018-03-29 20:06:41 -07:00
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -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
uraniummeltdown
b09e3ae6f6 spacing, src/loc consistency in playsound, reverted the weapon hitsound change, removed silicon/damage_procs.dm as it's unrelated and wasn't even included in the .dme, fixed some typos 2018-03-05 02:07:31 +05:00
uraniummeltdown
946ae0d58d moves var/list/armor to /obj level
adds armor to many objects
re-adds the clockcult floor sprite (accidentally removed in another PR)
adds clockcult effects to the clockcult floor
adds clockcult grilles
adds var/broken to /obj/structure
adds unused resistance_flags var
moves burn_state and resistance_flags to flags.dm
more updates to attack code
updated obj_defense.dm procs
2018-03-04 13:52:54 +05:00
Kyep
c08188ce4e more spiderling updates 2018-02-16 01:26:33 -08:00
Kyep
5c84b0a833 green event -> spawn 5 2018-02-16 01:18:28 -08: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
tigercat2000
a5e4ccdc18 Merge pull request #8103 from FalseIncarnate/reagents
Silver Slime Core and Random Reagent changes
2017-10-27 09:23:50 -07:00
tigercat2000
b974195d59 Merge pull request #8191 from imsxz/ready-for-xeno-salt
More consistent alien spawning
2017-10-07 10:01:22 -07:00
imsxz
f9cbd65ffd Xeno spawn consistency 2017-10-03 13:03:42 -04:00
FalseIncarnate
1ced72dfa5 Compromise is a bitch 2017-09-18 20:21:24 -04:00
FalseIncarnate
f3d6356224 Revert "Adjusts vent clog event chemicals"
This reverts commit 8b8c42dd8a.
2017-09-18 20:15:47 -04:00
FalseIncarnate
8b8c42dd8a Adjusts vent clog event chemicals
Removes adminordrazine and nanites from vent clog event reagents.

Adjusts vent clog event to include a few new uncommon reagents that may
spew forth in lower amounts.
2017-09-16 00:17:01 -04:00
Fox-McCloud
d35a5ea6e3 virus immunity trait not var 2017-07-13 19:47:23 -04:00
Fox-McCloud
b07eb1a0b5 Refactors Species Flags into Species Traits List 2017-07-13 18:55:45 -04:00
Fox-McCloud
17d7232cf3 Removes Disease one and Virology 2017-07-08 23:10:17 -04:00
Fox McCloud
9f27dd1068 Merge pull request #7580 from Aurorablade/ITSALIVE
Re-Open sentience event
2017-06-28 17:37:59 -04:00
Aurorablade
86dd1db600 fine 2017-06-28 00:37:49 -04:00
Aurorablade
f65778cdac spelling tweaks 2017-06-21 23:33:31 -04:00
Aurorablade
ff148fb2a6 fluff objectives 2017-06-21 03:08:58 -04:00
Aurorablade
15564fef42 Sentience_organic check. 2017-06-18 21:42:29 -04:00
Sam
fca8a46c49 Fixes errant improper capitalised references 2017-06-14 08:00:18 +01:00
Sam
0a0b0430e1 ghosts aren't simple animals, who knew? 2017-06-03 23:07:34 +01:00
Sam
6da7035973 Fixes errata in the text 2017-06-03 22:24:06 +01:00
Sam
5807cd69c0 Add sentience event 2017-06-03 21:47:14 +01:00
Fox McCloud
153de130f4 Merge pull request #7130 from FalseIncarnate/bugfix
Allows scythes to mass-clear glowshrooms
2017-04-26 00:10:26 -04:00
FalseIncarnate
f7c76befff Variable rename and operator change
Changes the variable name to avoid confusion, and changes the math to
use the *= operator.

Also does the same for the spacevines, for consistency.
2017-04-25 23:55:40 -04:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Kyep
5f9f4cbd02 Adds debugging jump to link for admins during brand intelligence events
Simply adds a debugging jump-to link for admins to use to quickly find
which machine is behind a brand intelligence outbreak.

Feature requested by DLP.
No CL, as admin-only.
2017-04-01 16:54:09 -07:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
davipatury
8963e96c41 effect/spider to structure/spider 2017-03-27 19:01:25 -03:00
davipatury
82bfd6e4b3 effect/spacevine to structure/spacevine 2017-03-27 18:51:08 -03:00
davipatury
550fdd3ae3 effect/blob to structure/blob 2017-03-27 18:41:19 -03:00
FalseIncarnate
45354f9ccf Don't Fear the Reaper
Re-adds the admin-spawned Telescopic Scythe
- Originally added in #1025, this was (probably accidentally) removed
with TG botany.
- Extended tele-scythe damage increase from 13->15 to give it a very
small bonus over the normal scythe in addition to its folding
capabilities

Fixes scythes not properly clearing multiple vines on-hit.
- Telescopic scythes only will do this if extended; they are next to
useless against vines while folded

Added an on-back sprite for the telescopic scythe while extended
(recolored scythe). Folded telescopic scythes worn on the belt do not
have an on-mob sprite.

🆑
rscadd: Re-adds the telescopic scythe, the pinnacle of covert reaping
technologies. Currently admin-spawn only, for use in the most dire of
harvest times.
bugfix: Scythes (normal and telescopic) should once again clear swathes
through all but the hardiest of vines when in proper reaping
configurations, and heavily damage those they don't outright destroy.
/🆑
2017-03-24 04:58:01 -04:00
Mark van Alphen
06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01:00
Fox McCloud
c6e3fe3cdb Merge pull request #6734 from uraniummeltdown/plastic
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
2017-03-15 06:33:02 -04:00
uraniummeltdown
85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04:00
Crazylemon64
25cde1f8e8 Reverts rwall change, reworks aggressive spread instead 2017-03-10 04:56:10 -08:00