Commit Graph

14537 Commits

Author SHA1 Message Date
Cheridan
bb97cb8a2a Merge pull request #16237 from PKPenguin321/patch-9
tweaks some evil fucking punctuation
2016-03-21 02:16:49 -05:00
Jordie
d31bc85106 Merge pull request #16082 from Core0verload/plants-revengeofGMO
Adds a test version of bioengineering
2016-03-21 15:57:40 +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
Cheridan
c533a17259 Merge pull request #16216 from phil235/CanisterBreakFix
Canister breaking open now properly disconnects from possible connect…
2016-03-20 11:47:50 -05:00
AnturK
ee0b605e22 Merge pull request #16209 from MrStonedOne/1328fix
Fixes wall mounted objects under 510.1332 and up.
2016-03-20 14:09:17 +01:00
Cheridan
be1770a475 Merge pull request #16208 from KorPhaeron/cargo_guard
Gives sec cargo guard access to the mining station
2016-03-20 01:24:17 -05:00
PKPenguin321
3bd3ff20ec adds a couple of naughty missing periods
@cheridan uuuu
2016-03-19 23:11:51 -07:00
PKPenguin321
03198df8a8 removes evil fucking comma from experimentor.dm
jesus fuck this thing annoyed me every single god damn time i saw it and i am so glad i am finally removing it
2016-03-19 22:24:03 -07: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
Cheridan
72256282cf Merge pull request #16162 from KorPhaeron/cats
Restores runtime to his original look
2016-03-19 21:48:21 -05:00
Cheridan
9a6e95e336 Merge pull request #16047 from RandomMarine/hallelujah
Adds holy hand grenades.
2016-03-19 21:43:48 -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
Cheridan
259f34f1a5 Merge pull request #15996 from optimumtact/atom_spawner_system
Add infrastructure for safely spawning atoms at roundstart
2016-03-19 20:41:33 -05:00
Cheridan
e57427fa8a Merge pull request #15712 from optimumtact/airemovalfinal
Refactors the bulk string framework
2016-03-19 20:34:36 -05:00
Cheridan
3b18b810c8 Merge pull request #16184 from KorPhaeron/sand2
Lavaland Sand
2016-03-19 20:22:36 -05:00
KorPhaeron
26b4c8c03a Tentacle 2016-03-19 19:55:21 -05:00
oranges
d4a5d61ea5 Minor tweak and fixes to subsystem logic
-only process roundstart spawners when they're needed

-use the same method to call atom_spawners for template loading.
    Assuming user is adding to the appropriate process list, this will not
cause issues
2016-03-19 22:41:38 +00:00
oranges
f9e6e2bca7 Add subsystem for safely spawning atoms at roundstart
This system is called just before initialize and does not use a world
loop, so it is safe to spawn and create new atoms.

Any atom can inherit this behaviour by overriding the
spawn_atom_to_world proc and spawning atoms there at roundstart

Make sure you register the atom in question to the list of spawner atoms
by doing SSobj.atom_spawners += src, and then remove when you are done
spawning objects
2016-03-19 22:41:38 +00: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
Cheridan
e2903a6cba Merge pull request #16189 from ChangelingRain/suitless
Space suits are much less likely to appear in the syndicate crate
2016-03-19 16:32:53 -05:00
phil235
09e3f1e7ae Canister breaking open now properly disconnects from possible connector port. Canister broken stat now use machinert's (stat & BROKEN) instead of a separate destroyed var.
When a canister breaks it now empties its air correctly.
When deleted the canister properly disconnects itself from its connector port.
You can no longer wrench a broken canister onto a connector port.
You can no longer interact (topic window) with a broken canister. (using an analyzer shows the canister is empty)

Removes message in machinery/attack_hand() saying the machine seems offline, it was showing even when the machine is just (stat & BROKEN).
2016-03-19 17:42:50 +01:00
Joan Lung
a9a8b5c976 Merge pull request #16155 from MrStonedOne/patch-168
makes emoji parsing return the text if they runtime
2016-03-19 03:50:37 -04:00
KorPhaeron
107921621b Cargo Guard 2016-03-19 01:40:43 -05:00
Cheridan
9e091ae4c3 Merge pull request #16161 from MrStonedOne/patch-169
Breathing requests a turf activation
2016-03-19 01:36:35 -05:00
MrStonedOne
93c5d1b7ab fixes wall mounted objects 2016-03-18 21:45:22 -07:00
KorPhaeron
77805b6f64 Merge pull request #16168 from phil235/ChameleonUnderFix
Fixes chameleon jumpsuit not working.
2016-03-18 21:40:39 -05:00
Joan Lung
fe35066feb Merge pull request #16140 from KorPhaeron/fix2
[s]Fix survival capsules (again)
2016-03-18 22:24:34 -04:00
Joan Lung
4b43e9ed7d Merge pull request #16166 from KorPhaeron/smooth
Re-adds smoothing to lava
2016-03-18 22:20:10 -04:00
KorPhaeron
098abee0b6 Merge pull request #16174 from ChangelingRain/xxxray
Xray lasers now have unique sprites and inhands
2016-03-18 21:19:01 -05:00
KorPhaeron
ab263f6d90 Abandoned Crates 2016-03-18 20:54:20 -05:00
KorPhaeron
f2b45dfec5 Merge pull request #16163 from F-OS/master
Fixes Condiment bottles having inconsistent transfer amounts.
2016-03-18 17:33:38 -05:00
KorPhaeron
3f317a76a3 Rainbow Golems 2016-03-18 17:22:35 -05:00
Nerd Lord
e7a395a980 Space suits are much less likely to appear in the syndicate crate
Nukeops can once again buy noslips(god)
2016-03-18 18:01:00 -04:00
KorPhaeron
db20c9cf4f Lavaland Sand 2016-03-18 14:09:30 -05:00
Kyle Spier-Swenson
34ac54b0a8 Update life.dm 2016-03-18 02:28:30 -07:00
Nerd Lord
e41a25549e Xray lasers now have unique sprites and inhands 2016-03-17 23:21:52 -04:00
phil235
6883a0dfda Fixes chameleon jumpsuit not working. 2016-03-18 00:06:18 +01:00
Joan Lung
f3f598225e Merge pull request #16129 from KorPhaeron/mutagen
Adds a mutagen dispenser
2016-03-17 17:46:37 -04:00
Joan Lung
87e54660c7 Merge pull request #16110 from KorPhaeron/chaos2
Changes Chaos Guardian's attack
2016-03-17 17:43:49 -04:00
KorPhaeron
389bceb89a Smoothing 2016-03-17 15:58:28 -05:00
KorPhaeron
751e289921 Re-adds smoothing to lava 2016-03-17 15:49:50 -05:00
Nerd Lord
f7a2348ef7 Nar-Sie will now corrupt doors, tables, windows, and windoors 2016-03-17 16:28:26 -04:00
F-OS
368a64edb7 annnnd i'm a moron 2016-03-17 10:43:11 -07:00
F-OS
017649f40e Fixes issue #14826 2016-03-17 10:41:59 -07: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
Kyle Spier-Swenson
e59c1308e4 makes emoji parsing return the text if they runtime
so that byond breaking icons doesn't break ooc chat or admin helps
2016-03-16 21:28:36 -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