AnturK
0252a01115
Merge pull request #16181 from Jordie0608/goodcodingpracticesarelikeusefulcommentsthisfilehasneither
...
Cleanup of polling code
2016-03-22 19:25:56 +01:00
KorPhaeron
c5746e84ae
Merge pull request #16267 from CPTANT/Staminafixnew
...
fixes #15316 - Stamina resistance being applied twice
2016-03-22 13:03:14 -05:00
Nerd Lord
4865ca6a7e
a donk
2016-03-21 18:08:05 -04:00
Nerd Lord
f062e54887
too close must conflict
2016-03-21 17:30:39 -04:00
Cheridan
6b65866444
Merge pull request #16210 from ChangelingRain/lightningmaster
...
Adds Lightning Holoparasites
2016-03-21 15:34:59 -05:00
CPTANT
fbbd5b0259
fixes stamina resistance
2016-03-21 14:49:47 +01:00
Cheridan
0fafccf9ef
Merge pull request #16178 from KazeEspada/GPStendrils
...
Necropolis Tendrils emit an eerie signal.
2016-03-21 02:53:15 -05:00
Jordie0608
5f4b341a4b
fixes and user notification
2016-03-21 16:32:27 +11:00
Cheridan
dae163e814
Merge pull request #16226 from KorPhaeron/tentacle2
...
Anchors goliath tentacles
2016-03-20 19:25:33 -05:00
Joan Lung
d7f81ba433
Merge pull request #16190 from KorPhaeron/tastetherainbow
...
Mineral Golems
2016-03-20 18:38:00 -04:00
Nerd Lord
b07f39771b
slow-ass lightning overlords
2016-03-19 23:07:59 -04:00
Cheridan
c6ab8b0041
Merge pull request #16165 from ChangelingRain/cultlock
...
Nar-Sie will now corrupt airlocks, tables, windows, and windoors
2016-03-19 21:58:12 -05:00
Nerd Lord
46a9de4e43
terrifying lightning overlords
2016-03-19 22:54:09 -04:00
Cheridan
72256282cf
Merge pull request #16162 from KorPhaeron/cats
...
Restores runtime to his original look
2016-03-19 21:48:21 -05:00
Cheridan
454af7cb2d
Merge pull request #16197 from KorPhaeron/crates
...
Adds abandoned crates to lavaland (sort of)
2016-03-19 21:29:18 -05:00
KorPhaeron
26b4c8c03a
Tentacle
2016-03-19 19:55:21 -05:00
oranges
2311102c7b
Refactors the bulk string framework
...
In favour of a better json based solution
This overhauls:
-AI ion laws
-NPC chatter text
The system is extended to support further splitting of a chosen line
where a line is picked and then searched for subkey's in the form of
@pick(\D+) - sub keys are then picked from the appropriate list that
matches the \D+ key and replaced over top of the placeholder
This is used to add braindamage gibbering messages to the system
2016-03-19 22:37:32 +00:00
Nerd Lord
4af2397a92
gotta update health
2016-03-19 17:48:41 -04:00
Nerd Lord
392ebde0ca
slight efficiency change
2016-03-19 12:25:14 -04:00
Nerd Lord
050460227f
if alive, rebuild the summoner chain
2016-03-19 11:46:22 -04:00
Nerd Lord
6fc68ff9aa
fiiiiixed woo woo
2016-03-19 10:25:25 -04:00
KazeEspada
b5a48866bb
Fixes issues put forth by maintainers.
2016-03-19 01:09:32 -07:00
Nerd Lord
08903c8421
Adds Lightning Holoparasites
2016-03-19 03:56:59 -04:00
Cheridan
9e091ae4c3
Merge pull request #16161 from MrStonedOne/patch-169
...
Breathing requests a turf activation
2016-03-19 01:36:35 -05:00
KorPhaeron
ab263f6d90
Abandoned Crates
2016-03-18 20:54:20 -05:00
Nerd Lord
ddfd21bb47
Buffs Explosive Holoparasites
2016-03-18 20:34:51 -04:00
KorPhaeron
3f317a76a3
Rainbow Golems
2016-03-18 17:22:35 -05:00
Jordie0608
407c98a70d
cleanup of polling code
2016-03-18 23:21:57 +11:00
Kyle Spier-Swenson
34ac54b0a8
Update life.dm
2016-03-18 02:28:30 -07:00
KazeEspada
132501bc94
Necropolis Tendrils emit an eerie signal.
...
Necropolis Tendrils not produce an eerie signal. Use this to find them or avoid them.
2016-03-17 23:29:40 -07:00
Joan Lung
87e54660c7
Merge pull request #16110 from KorPhaeron/chaos2
...
Changes Chaos Guardian's attack
2016-03-17 17:43:49 -04:00
Nerd Lord
f7a2348ef7
Nar-Sie will now corrupt doors, tables, windows, and windoors
2016-03-17 16:28:26 -04:00
KorPhaeron
97af8a919b
Cat
2016-03-17 12:39:20 -05:00
Kyle Spier-Swenson
16b29672f4
Breathing requests a turf activation
...
The idea is to let atmos handle if the turf needs to be activated.
This won't activate a turf unless it's needed, and most won't need this, but a few will, so its nice to have.
Also means admins can spawn 100 humans again without them all dying in fire minutes to co2 poisoning because turfs didn't activate
2016-03-17 09:01:42 -07:00
Joan Lung
78ca149554
Merge pull request #16132 from KorPhaeron/walker
...
Fixes ash walkers being half invisible
2016-03-16 22:46:47 -04:00
Remie Richards
f21d675fbe
Merge pull request #15849 from Core0verload/jetpack
...
Jetpack nerf revert, new jetpack implant
2016-03-17 00:59:23 +00:00
duncathan salt
46d62be642
Merge pull request #16128 from KorPhaeron/watcher2
...
Fixes watcher becoming invisible when killed
2016-03-16 08:13:32 -06:00
Cheridan
aa614f0bf6
Merge pull request #16124 from Incoming5643/diamond_dogs_are_forever
...
Adds persistence mechanics for Ian
2016-03-16 00:21:45 -05:00
KorPhaeron
a6e09b1ca4
Fixes ash walkers being invisible
2016-03-15 12:21:01 -05:00
KorPhaeron
beefe60f80
Watcher Fix
2016-03-15 08:57:49 -05:00
Incoming
b2495ba00c
Adds persistence mechanics to Ian:
...
Ian will remember what hat he's wearing between rounds provided he survives
Ian will record his age in rounds survived. This has two special conditions:
1. The round after Ian is killed, he'll be a puppy
2. Any round where Ian ties or beats his previous age record he'll be old Ian, with a little doggy wheelchair.
Also includes a hopeful fix to catsplosion: Cats are never supposed to give birth to more than three kittens, but the check for these children used an oview, which excluding kittens on the cats tile (where they all start)
2016-03-15 00:53:26 -04:00
Cheridan
93cb1eb0a0
Merge pull request #16033 from KorPhaeron/its_a_beta_they'll_fix_it
...
Lavaland
2016-03-14 16:47:08 -05:00
KorPhaeron
745538b397
Legion bodies are damaged
2016-03-14 16:14:11 -05:00
KorPhaeron
bd41a0ed98
Chaotic
2016-03-14 15:24:57 -05:00
KorPhaeron
288017eeb6
In fact lets not buff any of them just yet
2016-03-14 12:16:39 -05:00
KorPhaeron
a0962ab7b8
I made the watcher too scary
2016-03-14 12:14:00 -05:00
KorPhaeron
ad0f888f7c
Ash Walkers
2016-03-14 10:23:26 -05:00
KorPhaeron
cb6de824cb
Monster Nests, more maps
2016-03-14 07:25:26 -05:00
Jordie
ea4febddc7
Merge pull request #16083 from sawu-tg/snpcupdate
...
SNPC Expansion v. Traitorous Scum
2016-03-14 22:06:33 +11:00
Cheridan
c249ba8ca3
Merge pull request #16076 from KorPhaeron/hungry
...
Re-adds hunger to the game
2016-03-13 21:50:54 -05:00