Commit Graph

15491 Commits

Author SHA1 Message Date
Jordie0608
1fc89cb611 removes soh singulo interaction 2015-03-26 13:19:56 +11:00
Jordie0608
a6a9aa8a89 adds some sanity checks 2015-03-25 18:03:48 +11:00
Jordie0608
a5396f320a confirmation check for boh bombing + soh also makes singulo 2015-03-25 17:29:43 +11:00
Jordie
9ee247cb8c Merge pull request #8438 from Incoming5643/golem_the_MODE
Identity theft with non crew humans
2015-03-25 16:31:35 +11:00
Jordie
36b928eca8 Merge pull request #8463 from tgstation/RemieRichards-bored
Adds getPixelDistance()
2015-03-25 16:31:27 +11:00
Jordie
0e57fc6941 Merge pull request #8488 from Miauw62/whatsthedifferenceanyway
Adds a verb_exclaim var. Fixes #8478.
2015-03-25 16:31:16 +11:00
Jordie
ff90e1599c Merge pull request #8320 from AnturK/headcrabs
Adds Headcrabs!
2015-03-25 16:31:00 +11:00
Jordie
9a217503aa Merge pull request #8451 from Fayrik/FoamForceFuckYeah
Foam force fuck yeah!
2015-03-25 16:30:42 +11:00
Jordie
f8b40d4112 Merge pull request #8489 from Incoming5643/delta_smelta
The station will drop out of delta if the malf dies in a mulligan
2015-03-25 16:30:24 +11:00
Jordie
c5e5d36244 Merge pull request #8506 from phil235/BottleHitMsgFix
Fix mistake in bottle hitting message.
2015-03-25 16:30:08 +11:00
Jordie
66ab60d5e1 Merge pull request #8476 from Pennwick/master
Adds Chem Master board
2015-03-25 16:29:41 +11:00
Jordie
fde0eecce8 Merge pull request #8456 from MrPerson/im_the_music_meisteeeeeeeeeeeeeer
Instrument tweaks
2015-03-25 16:29:29 +11:00
Jordie
0cbcda509d Merge pull request #8448 from AnturK/gothisway
Adds arrow graffiti
2015-03-25 16:29:15 +11:00
AnturK
eadfecd552 - Makes body_egg parent for alien embryos/changeling eggs 2015-03-24 17:54:20 +01:00
AnturK
88f2eda81e - Headcrabs
- Changelog & Name

- Description
- Removes debug message
- Fixes cavity surgery removal

Oops

- Headslug sprites courtesy of ZyloWalsh
- Squash
2015-03-24 12:53:13 +01:00
Jordie
59af7cfd42 Merge pull request #8323 from Mandurrrh/miningborgupgrade
Adds a cyborg upgrade module for the satchel of holding.
2015-03-24 16:40:52 +11:00
hornygranny
14fa16078f Merge pull request #8368 from Cheridan/day1
Spring Event Day 1: Martyr Objective!
2015-03-23 17:15:55 -07:00
Cheridan
7ee7af290b More lines changed this way giacom :^) 2015-03-23 19:07:14 -05:00
hornygranny
1b5633c0ff Merge pull request #8487 from phil235/RCDAirlockDisassemblyFix
Fixes default airlock not dropping any door assembly when deconstructed.
2015-03-23 16:35:35 -07:00
hornygranny
979d308f49 Merge pull request #8497 from Iamgoofball/patch-46
fixes sodium thiopental bottle
2015-03-23 16:34:01 -07:00
hornygranny
b73dd39854 Merge pull request #8436 from phil235/VendMachineCoinItemsFix
Fixes vending machines starting with no coin or hacked items.
2015-03-23 16:33:26 -07:00
hornygranny
078b123fc1 Merge pull request #8474 from Incoming5643/dont_overextend_yourself
Fixes a big old mistake in mulligan antag that made extended mulligans WAY too common
2015-03-23 16:33:08 -07:00
hornygranny
1b16960f31 Merge pull request #8481 from Miauw62/agqgdoqio
Re-adds forcesay
2015-03-23 16:32:37 -07:00
hornygranny
506da51f96 Merge pull request #8455 from Incoming5643/how_bout_I_get_you_some_stones
Adds click delay to smacking up statues
2015-03-23 16:31:53 -07:00
hornygranny
2e04be734f Merge pull request #8449 from MrPerson/feature_removal_5
Remove xylophone skeleton ribcage playing
2015-03-23 15:10:11 -07:00
phil235
759b63647a Derp, only need one loop. 2015-03-23 16:02:26 +01:00
Cheridan
beacf0cf4a Merge pull request #8349 from MrPerson/qdel_reagents_hopefully
Fix reagent garbage collection hopefully
2015-03-23 08:55:11 -05:00
Cheridan
6543b5c1e9 Merge pull request #8461 from Iamgoofball/patch-45
Fixes the zombie powder recipe
2015-03-23 08:39:16 -05:00
Cheridan
773dd84211 Merge pull request #8452 from Incoming5643/when_shit_gets_too_popular_death_must_follow
Magic Mania 1.87: Summon Events Settles Down And Starts A Family
2015-03-23 08:36:04 -05:00
phil235
efdbdef49f Fix mistake in bottle hitting message. 2015-03-23 14:27:52 +01:00
Iamgoofball
f1b40bf6ae fixes sodium thiopental bottle 2015-03-22 20:19:21 -07:00
Pennwick
b69d08593e Correct errors spotted by Razharas 2015-03-22 18:50:59 -05:00
Fayrik
117d9d11cd Riot darts are now available to Nuke ops and Traitors. And I am SO done with this. 2015-03-22 22:11:56 +00:00
Razharas
6baed3a0e5 Merge pull request #8464 from Szunti/patch-1
prob() with rand() is the same as a plain prob()
2015-03-23 00:27:47 +03:00
Swag McYolosteinen
53e40ec315 Merge pull request #8427 from Cheridan/day3_collars
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01:00
Incoming
f9a0a85cd4 The station will drop out of delta if the malf dies in a mulligan 2015-03-22 14:21:25 -04:00
Cheridan
e5c3d421db Adds renaming, Adds collars to pet crates 2015-03-22 13:16:30 -05:00
Miauw
521820f289 Makes the white dress a suit. 2015-03-22 19:13:15 +01:00
Miauw
e5637301ba Adds a jester suit and a white dress, both by Nienhaus. 2015-03-22 19:12:25 +01:00
Miauw
ba2a1c8f19 Adds a verb_exclaim var. Fixes #8478.
Also makes saymods transmitted through the radio system for upcoming NTSL integration.
2015-03-22 18:55:59 +01:00
phil235
1430962c40 Fixes default airlock not dropping any door assembly when deconstructed. 2015-03-22 18:42:27 +01:00
Nienhaus
9486248553 Merge pull request #8440 from dannno/coperite
GAR GLASSES
2015-03-22 12:05:21 -05:00
Swag McYolosteinen
5bf9366bab Removes spaces causing inconsistent indentation error 2015-03-22 13:01:08 +01:00
Swag McYolosteinen
ef156368ca Re-adds forcesay 2015-03-22 12:34:55 +01:00
MrPerson
2fa6457130 Added a preference toggle for hearing musical instruments 2015-03-22 01:54:30 -07:00
MrPerson
9229f72573 Fix up certain chemicals to not overwrite Del(). Meh.
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_reagents_hopefully

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
2015-03-21 23:04:53 -07:00
Jordie
94de5c997e Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights
Attachable Seclite & Camera to Helmet
2015-03-22 16:56:11 +11:00
Pennwick
18d55956a7 Update Chemistry-Machinery.dm 2015-03-21 22:37:55 -05:00
Razharas
a67d8339b7 Merge pull request #8414 from phil235/TablecraftVarietyFix
Fixes not being able to tablecraft recipes using differen kinds of an item
2015-03-22 05:32:43 +03:00
Incoming5643
f56a294f7a missed a testing change, whoops! 2015-03-21 21:58:29 -04:00