Commit Graph

26851 Commits

Author SHA1 Message Date
Cheridan 7909f8728d Merge pull request #17351 from KorPhaeron/dragon3
Drake Fixes
2016-05-03 22:52:34 -05:00
Joan Lung 27824d0489 Merge pull request #17301 from Bawhoppen/syndieboxes
Makes nukeop start with syndie gasmask in internal box
2016-05-03 22:56:06 -04:00
Joan Lung 6a927695e5 Merge pull request #17342 from Shadowlight213/Ahelprelay
Adds cross server adminhelp relaying
2016-05-03 22:46:18 -04:00
Shadowlight213 a3b4d118c4 Gives relays their own proc 2016-05-03 19:14:24 -07:00
Cheridan 6649e136d0 Lavaland Ruin update (#17348)
* Lavaland Ruin update

* Make Beach Biodome Great
2016-05-03 20:38:44 -05:00
Cheridan 75f404b326 Merge pull request #17337 from ChangelingRain/innatecomms
Cult communication is now innate and has an action button
2016-05-03 20:23:52 -05:00
Cheridan afd5f80669 Merge pull request #17352 from Shadowlight213/Monkeylose
Fixes monkey mode victory condition
2016-05-03 20:18:29 -05:00
bawhoppen 216f321030 ree copypaste 2016-05-03 20:09:27 -05:00
kilkun b13bd68640 Makes dehydrated carps more fun (#17302)
* Beginning of new side-tag

First bit of code to implement the Syndicate Lawyer, a single-man antag
with a plethora of abilities and armor to help him including:
>Turning unimplanted crew into gang members
>Disguising himself as a crew member to implanted folks
>Ripping open doors and blast shields

This commit includes:
>Rudimentary event code
>WIP ganger code
>Clothing defines

And modifies the default gang_datum, which will be relevant when ganger
code is finished.

* Makes Dehydrated Carp more malleable for fun

Allows admins to change what mob spawns from dehydrated carp via var
editing.

* removes bloat

Wew this commit history will look wack

* wew

* wew number 2

* Revert "wew"

This reverts commit 75dce9ec56bc8c69c1e7a338d98d4f9e64f3cf9d.

* Revert "removes bloat"

This reverts commit 55a456593709d67a030f15c5b10e5d9aa6042f87.

* Revert "Revert "removes bloat""

This reverts commit 1994fdd08ecb51cd1fd9e09973954c9800ed0f54.

* makes codebase great again

* Final destination for codebase fixes

WEW LADS

* Fixes compiler errors

* Actually properly fixes compile errors

* Fixes missed incorrect variable

This is starting to get ridiculous for a simple feature

* This is starting to get embarrassing.
2016-05-03 19:30:32 -05:00
KorPhaeron ac6e26abc0 Merge pull request #17343 from ChangelingRain/lowpop
Reduces cult minimum population to 24
2016-05-03 19:24:34 -05:00
Joan Lung 24d2de54a6 Merge pull request #17332 from MrPerson/giving_a_monkey_a_shower
Monkey cubes work in sinks again
2016-05-03 20:19:33 -04:00
Joan Lung 85d60e93f3 Merge pull request #17318 from coiax/we-can-hear-you
Revenant and alien whispering heard by ghosts
2016-05-03 17:16:28 -04:00
Cheridan e7ee10b517 Merge pull request #17060 from KorPhaeron/belt
Military Belt is not a backpack
2016-05-03 13:10:23 -05:00
KorPhaeron 6e10a6a839 Stronger Attack 2016-05-03 11:46:09 -05:00
Aloraydrel 89ab88a7e1 Lab coats can carry emergency oxygen tanks (#17307)
* Adds emergency tanks to labcoat.dm


* I have little idea what im doing but this should work

* Ok this is it

* Ree
2016-05-03 12:55:48 +02:00
KorPhaeron d191efc751 Merge pull request #17329 from Cheridan/scavengers
Ashwalker Den Update
2016-05-03 03:01:50 -05:00
Jack Edge 72310cc63e More code review 2016-05-03 08:16:26 +01:00
Cheridan e64783c1fa Merge pull request #17282 from coiax/brobot-is-an-artist
Service and standard cyborgs get a spraycan; service cyborgs get a cyborg-hand labeler
2016-05-03 01:55:01 -05:00
KorPhaeron 423ee67c73 Merge pull request #17330 from coiax/lavaproof-staff
Staff of lava is now lavaproof
2016-05-03 01:03:46 -05:00
KorPhaeron 11fa336dd9 Ghost sword fix 2016-05-03 00:10:39 -05:00
Shadowlight213 cef80d7039 Fixes monkey mode victory condition 2016-05-02 21:07:07 -07:00
KorPhaeron 9775b8cdcc Dragon Fixes 2016-05-02 21:44:11 -05:00
Joan Lung fe060eb1fa Merge pull request #17306 from coiax/fleshmend-diminishing-returns
Fleshmend: Diminishing returns; Panacea: Better.
2016-05-02 18:52:17 -04:00
Jack Edge 9f7e6f04ed Code review 2016-05-02 23:30:08 +01:00
Jack Edge 50fd90e25f Fixes compile errors 2016-05-02 23:20:12 +01:00
Jack Edge c1e4c0163c Code review 2016-05-02 23:08:31 +01:00
Jack Edge 340dd8b1a3 Reduced mannitol to sane amounts 2016-05-02 22:27:43 +01:00
Jack Edge 4ee3d491e7 Corrected incorrect description of booze 2016-05-02 22:23:36 +01:00
Jack Edge 7c293f0aa6 Spray cans contain flammable solvents
Also, spraying someone will stun them even if they lack a client.
2016-05-02 22:19:49 +01:00
Cheridan d67922d626 Walker tendrils strip mobs before gibbing now 2016-05-02 14:38:41 -05:00
Nerd Lord de619e639f Reduces cult minimum population to 24 2016-05-02 15:05:07 -04:00
Shadowlight213 50372a586f Adds basic cross server message relay system. Currently setup to relay adminhelps to the other server in the case of no admins on a server. 2016-05-02 11:53:29 -07:00
AnturK 340b1d01ff Merge pull request #17314 from RemieRichards/mecha_pilot_fix
Mecha and Mecha pilot fixes
2016-05-02 20:25:44 +02:00
Joan Lung faad4d5b71 Merge pull request #17293 from RemieRichards/clothing_variable_modding
Allows clothing to alter variables on the wearer, Admin modifiable too!
2016-05-02 12:21:23 -04:00
Remie Richards bc754a7bfc Fixes Haunted Mecha, Fixes Mecha damage runtimes, Fixes Mecha bumpsmash working without a pilot. 2016-05-02 17:18:34 +01:00
Nerd Lord 0897f3bc20 Cult communication is now innate and has an action button 2016-05-02 09:11:06 -04:00
AnturK 878d76a4b7 Merge pull request #17062 from Core0verload/bloodbrood
New function for hivelord core / legion heart
2016-05-02 11:39:18 +02:00
KorPhaeron 31cc0d1dc8 Merge pull request #17264 from PKPenguin321/patch-2
makes screwing windows 1 second faster
2016-05-02 03:51:52 -05:00
MrPerson e07bd56b55 [s] Monkey cubes work in sinks again 2016-05-02 01:45:46 -07:00
Jack Edge 292901357e Staff of lava is now lavaproof
Staff of lava is now lavaproof.
2016-05-02 09:07:47 +01:00
Cheridan 6db3624cf8 Ashwalker Scavengers 2016-05-02 02:45:39 -05:00
Cheridan 581a755ae5 Merge pull request #17269 from Core0verload/supplytimer
Drops supply shuttle delay to 1 minute
2016-05-02 00:01:46 -05:00
Cheridan 46c0b3c6db Merge pull request #17281 from bgobandit/memerystocks
Changes the stock market permanently and drastically
2016-05-01 23:53:52 -05:00
Cheridan d54a07b537 Merge pull request #17279 from RandomMarine/crithud
Buffs medical hud.
2016-05-01 23:51:45 -05:00
Cheridan ce163d902c Merge pull request #17286 from bgobandit/domfix
Broken dominators will no longer beep once a new dominator is activated.
2016-05-01 23:48:10 -05:00
Cheridan 08579759fb Merge pull request #17296 from ChangelingRain/justwatch
Watchers now instantly fire at targets instead of setting temperature
2016-05-01 23:30:25 -05:00
Cheridan 23cb217905 Merge pull request #17299 from RandomMarine/mobile
Changes locker description
2016-05-01 22:26:15 -05:00
Cheridan 009988b553 Merge pull request #17292 from erwgd/PlasmamanStartInternalsOn
When joining game as plasmaman, start with internals on
2016-05-01 21:58:30 -05:00
Joan Lung 3eeb0cb8e9 Robust Cult changes
* Robust Cult changes

* just cache the turf ffs

* if you see something say nothing and drink to forget

* if you see something, say nothing and drink to forget

* messagefix

* if you see something say nothing, and drink to forget

* if you see something say nothing and drink to forget

* if you see something say nothing and drink to forget

* if you see something say nothing, and drink to forget
2016-05-01 21:37:02 -05:00
TechnoAlchemist 74bb2b28ab makes sure people have the right types of armor 2016-05-01 18:59:51 -07:00