Commit Graph

6494 Commits

Author SHA1 Message Date
Cheridan
454af7cb2d Merge pull request #16197 from KorPhaeron/crates
Adds abandoned crates to lavaland (sort of)
2016-03-19 21:29:18 -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
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
Kyle Spier-Swenson
34ac54b0a8 Update life.dm 2016-03-18 02:28:30 -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
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
KorPhaeron
c16a57b43d Pixel offset fix 2016-03-13 21:06:30 -05:00
KorPhaeron
973b66edbb Lava Monsters 2016-03-13 20:46:51 -05:00
Sawu
fc56e7f529 SNPC Expansion v. Traitorous Scum
* Fixes SNPCs still healing people
* SNPCs now use similar speech handling to Poly, and will mimic phrases in addition to their usual speech
* SNPCs can now be spawned as traitors, and given a special role.
* Greytide SNPCs now wear assistant outfits
* Certain jobs are now restricted to their area (can be toggled with restrictedJob)
* SNPCs start with a minor variation in stats
* Bartender SNPCs should now appropriately serve people
* Chef SNPC workflow redone, they will now prioritise preparing food over making it, and should serve more food to tables
* Third attempt at fixing infighting
* SNPCs should no longer repeatedly stun a target
* Friendly SNPCs now no longer have a combat module, and they are the station's faction
* NPCPool will routinely trim orders from it, reducing the amount of order ping-pong
2016-03-13 18:21:37 +11:00
KorPhaeron
8657b74fff Fixes hunger
Hunger
2016-03-12 20:55:02 -06:00
AnturK
cc034af9d4 Merge pull request #15999 from ChangelingRain/placesplease
Goon-style blob placement
2016-03-12 21:17:57 +01:00
KorPhaeron
ee61367807 Merge pull request #16040 from Boredone/master
Replaces Mediborg Acid Spray with Poison Hypospray
2016-03-12 13:54:54 -06:00
duncathan salt
deb3a1ac85 Merge pull request #16005 from optimumtact/patch-1
Don't damage eyes if flash intensity is zero
2016-03-12 13:47:10 -06:00
Cheridan
ba77895a5b Merge pull request #15992 from sawu-tg/master
Clown SNPC Spam hotfix
2016-03-11 22:34:44 -06:00
Boredone
189c06b21b Removed Proc 2016-03-11 10:06:31 -07:00
Boredone
6bfe0e921a This replaces the FAcid spray on Mediborgs with a Poisonous Hypospray 2016-03-11 01:52:59 -07:00
duncathan salt
ed47b418bf Merge pull request #16011 from ChangelingRain/binarybeep
Dead cyborgs no longer get binary messages twice
2016-03-10 22:36:23 -06:00
Cheridan
e43b3a891d Merge pull request #15964 from RemieRichards/buckle_many_mobs
Many Buckled Mobs
2016-03-10 08:22:27 -06:00
Nerd Lord
bda7404777 Dead cyborgs no longer get binary messages twice 2016-03-09 22:45:24 -05:00
oranges
baf007af4e Don't damage eyes if flash intensity is zero 2016-03-10 15:53:53 +13:00
Nerd Lord
1ead1acbfc Goon-style blob placement 2016-03-09 20:21:19 -05:00
Sawu
3607b2e7e3 Clown lube-spam hotfix
Fixes Clown SNPCs spamming admin logs with lube, as well as their targeting.
2016-03-10 02:03:59 +11:00
Razharas
f45e52fd20 Merge pull request #15976 from sawu-tg/snpcvree
SNPC Fixes/Patches v3.14etc
2016-03-09 14:54:46 +03:00
KorPhaeron
57493aa426 Merge pull request #15855 from kilkun/master
New Human Species Datum
2016-03-08 21:39:46 -06:00
kilkun
3a1eea243c Fixes speedmod polarity
Makes it so they are speedy
2016-03-08 21:45:54 -05:00
Cheridan
a171e94dfe Merge pull request #15955 from ChangelingRain/fuckthat
Fixes two posibrain names
2016-03-08 11:21:57 -06:00
duncathan salt
40ee6f66ba Merge pull request #15805 from bgobandit/catfixes
Cat fixes
2016-03-08 10:37:16 -06:00
Sawu
7871bb815f SNPC Fixes/Patches v3.14etc
* SNPC inter-faction relations should be fixed
* SNPC faction changed to synth by default
* Added a shouldUseDynamicProc toggle, which will tell the NPC to adjust their processing state based on players nearby
* SNPCs no longer drop a pile of stuff on customize
* Admins can now choose what crewmember to disguise the SNPC as, as well as the SNPC taking on the chosen player's appearence
* SNPCs will no longer try to randomly heal people
* Smartness values for traits fixed
* Job SNPCs that use enforceHome() should no longer take short trips to random locations
* Bartender SNPCs now serve drinks with more accuracy
* Clown SNPCs will now try to do pranks around crewmembers.
* Janitor SNPCs will now actually clean
* Chef SNPCs will now try to evenly distrobute food to nearby tables
2016-03-08 19:56:40 +11:00
Jordie
3a6a038322 Merge pull request #15945 from Shadowlight213/Snpcbuttonmove
Moves SNPC admin buttons to the debug tab
2016-03-08 18:38:48 +11:00
Remie Richards
4e821d8657 Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality 2016-03-07 18:03:25 +00:00
bgobandit
dbd01d8a43 fixed 2016-03-07 12:28:35 -05:00
bgobandit
ed67d189a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into catfixes
Conflicts:
	icons/mob/pets.dmi
2016-03-07 07:13:30 -05:00
bgobandit
128cf1e19d test 2016-03-07 07:07:34 -05:00