Commit Graph

26873 Commits

Author SHA1 Message Date
Cheridan
51466932c1 Merge pull request #17275 from Fox-McCloud/energy
Makes Shock Revolver Use Energy Projectiles
2016-05-04 15:16:39 -05:00
Cheridan
43c98210dd Merge pull request #17363 from ChangelingRain/notverysimple
Gives all living mobs a medical hud display
2016-05-04 14:52:13 -05:00
Cheridan
d58065d6ae Merge pull request #17360 from ChangelingRain/tipoftheblob
Examining the blob with an active research scanner or medical hud will display its effects
2016-05-04 14:40:08 -05:00
xxalpha
1b22679195 Fixes and buffs the banana shoes (#17305)
shhh
2016-05-04 12:25:23 -05:00
Aloraydrel
309dbe9786 Adds art supplies to cargo 2016-05-04 09:11:57 -05:00
Joan Lung
09b6caeb0e Merge pull request #17336 from coiax/coiax-fixes-things
Glass tables break more, Metastation HoP hat fix
2016-05-04 07:36:37 -04:00
Cheridan
3430bc9753 Merge pull request #17328 from TechnoAlchemisto/ARRPEE
Adds new emotes, allows for CAPITAL LETTERS to work in emotes.
2016-05-04 01:28:11 -05:00
TechnoAlchemist
528ce49e57 Adds dragon hide cloaks (#17322)
* dragon scales and cloak stuff

* Finishes shit with the ash drakes and the cloak

* woopsie
2016-05-04 00:43:31 -05:00
Cheridan
8b0a4384be Merge pull request #17320 from optimumtact/patch-1
Clean the world status proc slightly
2016-05-03 23:43:37 -05:00
Cheridan
7909f8728d Merge pull request #17351 from KorPhaeron/dragon3
Drake Fixes
2016-05-03 22:52:34 -05:00
TechnoAlchemist
03731c294b Cheridan is my childhood role model 2016-05-03 20:52:19 -07: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
Nerd Lord
d824fb59cd many worryingly accurate numbers 2016-05-03 19:50:26 -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
Nerd Lord
eea7ffb8c0 lockstep guardian hud 2016-05-03 16:27:40 -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
Nerd Lord
52ea8517c4 drones and swarmers get diag hud 2016-05-03 13:00:17 -04:00
KorPhaeron
6e10a6a839 Stronger Attack 2016-05-03 11:46:09 -05:00
Nerd Lord
3ab974494e Gives all living mobs a medical hud display 2016-05-03 12:13:43 -04:00
Nerd Lord
9acf8c7087 medhud too 2016-05-03 11:08:13 -04:00
Nerd Lord
6a7142962f Examining the blob with an active research scanner will display its effects 2016-05-03 10:56:26 -04: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
TechnoAlchemist
a43735baab s 2016-05-02 12:44:05 -07: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