Commit Graph

24383 Commits

Author SHA1 Message Date
Jordan Brown 9fbec4b7f0 Merge pull request #35792 from DaedalusGame/bitconnect
Fixes multiserver mining formula
2018-02-19 12:19:38 -05:00
coiax 39b0bac044 Mime's Bane recipe (#35570)
* Makes Mimes's Bane use the new EMOTEMUTE trait

It randomly occured to me that I should do this.

Mime's Bane is currently a reagent currently only used in cloning pods
to stop growing clones from gasping from crit/lack of air (since they're
in a pure nitrogen environment).

* 2 Mime's Bane = 1 Mute Toxin + 1 Nothing

* Mutetoxin + nothing + radium
2018-02-19 16:36:46 +02:00
vuonojenmustaturska 6900efb395 Merge pull request #35784 from Cruix/timestop_overlap
Fixed overlapping timestop behavior
2018-02-19 15:56:28 +02:00
XDTM 9d41e9734d Extensive surgery additions (#35520)
* Extensive surgery additions

* ,

* bioware

* restrict

* implants

* oops my hand slipped

* "i only changed a few lines, surely it's gonna compile, let's just push it and be done with it" --me, once again

* zombie surgery

* Adds brainwashing antag datum

* Antur Reviews

* @Antur part 2

* wow
2018-02-19 14:29:06 +02:00
vuonojenmustaturska ef1ee28af1 Merge pull request #35683 from lzimann/checka
Adds a space on check antag between name and role
2018-02-19 14:19:15 +02:00
vuonojenmustaturska b2be4ded19 Merge pull request #35797 from DaedalusGame/freon-is-back-baybee
Deletes a redundant double proc definition in paper bins
2018-02-19 14:11:10 +02:00
ShizCalev 4b7297d576 Sheet icon fixes (#35772)
* Fixes sheet inhands

* Fixed transparency

* Ore fixes
2018-02-19 03:36:13 -05:00
Nick d7de2da033 Update recipes_egg.dm (#35769) 2018-02-18 20:19:40 -05:00
Ashe Higgs 92a57f9b9e Fixes invincible blobs and blob nodes producing tiles after its death (#35706)
* Fixes invinciblobs

* who put that there in the first place?!

* Update theblob.dm
2018-02-18 20:03:12 -05:00
Jordan Brown 1d96b222c8 Removes one dotty boi 2018-02-18 16:39:18 -06:00
Leo Z 1f96d99c8f Adds a space on check antag 2018-02-18 12:09:46 -03:00
Leo b453c6be6d Removes unnused random event 2018-02-18 09:06:15 -06:00
vuonojenmustaturska 9f99c0faaa borgmods 2018-02-18 09:04:11 -06:00
Tlaltecuhtli 9f7e379090 bad copypaste 2018-02-18 09:03:26 -06:00
Tlaltecuhtli fbe268b2dc fixes being unable to burn catpeople
🆑
fix: u can make flametrowers in the lathe to kill catpeople
🆑
2018-02-18 09:03:26 -06:00
BordListian 0a3b27474b - Deletes a redundant double proc definition 2018-02-18 13:56:52 +01:00
Ordonis e9fe2468c5 Newliquors (#35581)
* Adds a few new liqueurs and cocktails

How the fuck in THIS game of all games do we not have Triple Sec.
SERIOUSLY.

* Well there goes a one commit clean PR rip me

reeeeee

* Adds sounds, fixes colors

* Fixes recipies giving eggnog

Don't ask

* Adds space where space should be

* Travis stop stalling reeeeeee

* Fixes spelling mistakes

* Adds some health benefits to sec drinks.

Quadruple sec is mild, but easy to make; quintuple sec is STRONG but
more difficult.

* Fixes merge conflict annoyance

* FUCK

* Updates boozepwr of Quadruple/Quintuple sec

If someone ever adds sex on the beach as a cocktail, I fully expect them
to add in Sex-tuple Sec as well.

* Makes clowntears reagent explicit within food_reagents

Removed hacky solution, introduced better one
2018-02-18 14:13:29 +02:00
vuonojenmustaturska cc4c69d078 Merge pull request #35746 from MoreRobustThanYou/patch-60
Actually fixes SCP 294 overlay problems
2018-02-18 14:08:08 +02:00
kevinz000 49482f7aa5 [s] makes chemical mob spawning log (#35756)
* Rudimentary logging

* Update recipes.dm
2018-02-18 14:06:39 +02:00
BordListian cc47143bca - Fixes multiserver mining
- Removes redundant value on research subsystem
2018-02-18 12:42:47 +01:00
coiax 393198b0e6 MMIs can now whisper without talking on the radio (#35738)
* MMIs can now whisper without talking on the radio

Fixes #35638.

* Otherwise, call super
2018-02-17 21:12:28 -05:00
YPOQ 9a9183d705 Fixes bicycle riding (#35739) 2018-02-17 21:11:59 -05:00
Ian Turk dd202e3a42 Fixed overlapping timestop behavior 2018-02-17 19:33:02 -06:00
kevinz000 c3060022a7 [READY]Fixes hitscan beams going across the station, hitscan projectiles now properly cross zlevels and generate beams. (#35344)
* Cross Z support

* Fixes projectile cross-Z

* removes unnecessary code

* don't draw impacts if you're not impacting

* fix

* unneeded var

* No mapcheck()ing anymore, space does it for us 2.0
2018-02-18 02:41:25 +02:00
Joan Lung c5a20f97c8 Makes the watcher wing crusher trophy less effective 2018-02-17 17:33:35 -06:00
Jordan Brown 0e9951317d Merge pull request #35728 from coiax/select-equipment-on-ghosts
Select Equipment works on observers
2018-02-17 18:09:12 -05:00
Jordan Brown 77f1c61835 Merge pull request #35724 from DaxDupont/bordlisten-loves-the-cocks
Fixes some tool interactions
2018-02-17 18:09:03 -05:00
Dax Dupont 221374e10b Reflectors now reset the range of a projectile like before! (#35726)
* Reflectors now reset the range of a projectile.

* how about dem apples
2018-02-17 14:17:11 -05:00
Dax Dupont 4c767ce101 Fixes extremely thicc robots (#35722)
* Fixes extremely fat robots

* grasp
2018-02-17 18:12:08 +02:00
coiax a3025b25de Removes abstract shotgun from Summon Guns list (#35736)
* Fixes abstract shotgun from Summon Guns list

Fixes #34962.

Looking at the old summon gun list, the comment says this
typepath was supposed to be a Bulldog.

* Removes duplicate bulldog
2018-02-17 18:05:19 +02:00
vuonojenmustaturska dfdc0c7fbc Merge pull request #35725 from jakeramsay007/slimepeoplefixes
Jellypeople (and all subtypes) now can actually speak Slime, as intended
2018-02-17 18:04:24 +02:00
vuonojenmustaturska ef7ab18130 Merge pull request #35720 from LetterN/patch-1
Pulling claw grammar fix
2018-02-17 18:03:37 +02:00
yorii cb1cd92c9e Adds Modafinil properly this time. (#34908)
* Adds modafinil, a sleep suppressant

* Adds recipe for modafinil

Yes I'm afraid of git now

* Fixed modafinil sleepimmune ids and OD to 15u

During testing 10u was simply much too low

* Change OD sleeping proc to use ignore_sleepimmune

* Fixed stuff to modafinil
2018-02-17 17:37:18 +02:00
TankNut b8b508456d Swaps locate for direct assignment 2018-02-17 08:53:15 -06:00
TankNut 75b7290cac Adds disable_sensors to mob_spawn/human 2018-02-17 08:53:15 -06:00
Jordan Brown c2a691214d Merge pull request #35717 from AnturK/robolove
Fixes AI dating
2018-02-17 01:47:09 -05:00
BordListian 2f2f789968 Adds rainbow slime clusterbangs (#35707)
* - slime
- yes

* - Adds a volatile reaction

* - There is no escape from the standards that live within
- Can't wait for the experimentor review
2018-02-17 01:46:32 -05:00
MoreRobustThanYou 228ce4f3e1 Actually fixes SCP 294 overlay problems 2018-02-16 20:01:05 -05:00
Leo a2ccca5f96 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines. Killing with a crusher grants special medals. (#35673) 2018-02-16 13:17:51 -05:00
Jack Edge 2b8dd31cd6 Select Equipment works on observers
- Admins can use the Select Equipment verb on observers. Doing so will
humanise them and then apply the equipment.
- Now when admins are putting on their Centcom Commander outfits, they
can skip the awkward naked stage.
2018-02-16 17:24:53 +00:00
MetroidLover c669c558ed Space Ninja smoke bomb refill (#35689)
* Ninja Smoke Bomb refill

Adds Ninja smoke bomb refill ability.

* Change a spaghetti flaw.

* I fluffed the indentation again. :P
2018-02-16 11:38:15 -05:00
AnturK a5bcb83ea7 Some antag fixes. (#35690)
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
2018-02-16 11:34:38 -05:00
Jordan Brown 5d5527855d Merge pull request #35697 from praisenarsie/patch-34
Fixes addiction text
2018-02-16 11:33:04 -05:00
Jordan Brown e2f94038da Merge pull request #35702 from DaedalusGame/scholar-of-the-first-sin-edition
Removes secondary
2018-02-16 11:31:52 -05:00
Chayse Ramsay f3421de13c Jellypeople (and all subtypes) now can actually speak Slime, as intended 2018-02-16 15:57:01 +00:00
Dax Dupont 88b6269888 Fixes some tool interactions 2018-02-16 16:34:17 +01:00
Jordan Brown 95cbf9b7f2 Merge pull request #35696 from Xhuis/circuit_rpg_loot
Fixes wizard RPG loot from making circuit analyzers useless
2018-02-16 08:52:14 -05:00
Letter N 23058f65ac Update manipulation.dm 2018-02-16 20:06:41 +08:00
vuonojenmustaturska 7014b5e06a Merge pull request #35629 from ShizCalev/floor-tool_acts
Converts floor tool interactions to tool_act, fixes flooring exploits
2018-02-16 14:06:32 +02:00
ShizCalev 15f0d19ce7 Adds mapping helpers to handle cyclelink & locking airlocks, updates all relevant maps (#35674)
* Adds airlock helpers

* Maps updated

* few more
2018-02-16 14:05:26 +02:00