Commit Graph

20570 Commits

Author SHA1 Message Date
4dplanner bd9b242575 Plants now react with turfs on squash() (#26752) 2017-05-01 16:34:29 -06:00
Cyberboss fa0b432a31 Makes admin sound announcement use the right span (#26746) 2017-05-01 16:31:24 -06:00
Shadowlight213 607809396f Fixes biogenerator (#26743) 2017-05-01 16:27:44 -06:00
oranges 37cd6e41f6 Merge pull request #26775 from Cyberboss/patch-63
Fixes atom spawning
2017-05-02 09:11:09 +12:00
oranges 162ca92e51 Merge pull request #26140 from coiax/arbitary-machine-occupant
Changes /obj/machinery to have atom/movable occupants
2017-05-02 08:58:19 +12:00
Joan Lung c6ed089214 Merge pull request #26779 from Thunder12345/revert-26739-patch-72
Revert "You can no longer queue up ahelps by queing up prompts"
2017-05-01 16:10:08 -04:00
Thunder12345 a7c10b052c Revert "Fixes Ahelp queing (#26739)"
This reverts commit 0c1620d32c.
2017-05-01 20:58:38 +01:00
Cyberboss 574c3dd19b Fixes atom spawning 2017-05-01 14:43:17 -04:00
Emmett Gaines ad6f0c818c Subsystem change for the SM and TEG and slight QoL (#26477)
* Port

* Why the fuck did I think fixing merge conflicts with the web editor was a good idea. The 2 minute before sleep commit

* Remove from subsystem on destroy

* Woops
2017-05-01 12:05:06 -06:00
Jack Edge 44991e125a Removal of checks II
- VR sleepers are human only.
2017-05-01 19:01:16 +01:00
Jack Edge 7cb8007556 Changes /obj/machinery to have atom/movable occupants
Currently `occupant` in /obj/machinery is a /mob/living type. I have
changed it to /atom/movable, and made a type cache to determine what to
"look for" when `close_machine()` is called.

This means that machines can have non-mob occupants. I have some design
ideas for this, but that's after the freeze.
2017-05-01 19:00:07 +01:00
Cyberboss 9d0185c023 Allows admins to pass parameters to New() (#26613)
* /proc/print_single_line(list/L)

* Admin datum/New parameters

* Fixes
2017-05-01 11:55:58 -06:00
QualityVan 02c9cb5df0 Saline-glucose changes (#26556)
* Refactors saline glucose solution to work as temporary blood instead of increasing blood regeneration.

* Prevents salglu from replacing all of your blood

* Added terrible deadly overdose effects

* consumption rate is probably fine as is, really
2017-05-01 11:54:44 -06:00
Cyberboss 1ed59144bc Holocalls (#25743)
* Port holopads to Initialize

* Small optimization

* Holocalls

* What dunc said

* Revert "What dunc said"

This reverts commit dd9f26762aab86c3ce981fd7deab700299d4ed94.
2017-05-01 11:52:49 -06:00
Profakos b3f587409d Ore redemption machine cleanup (#26708)
* Ore redemption machine uses material containers

* ORM won't send messages when empty

* QDEL_NULL for datums, and removes some unused lists
2017-05-01 10:53:37 -06:00
Cyberboss 0c1620d32c Fixes Ahelp queing (#26739) 2017-05-01 10:37:39 -06:00
Cyberboss d6c8ce6d9e Port SM shards to initialize (#26740) 2017-05-01 10:37:07 -06:00
4dplanner 9856a1d429 Makes surplus crates less likely to contain implants (#26737)
* Makes surplus crates less likely to contain implants

* Style points
2017-05-01 09:38:32 -04:00
FantasticFwoosh 583fbe68f1 Fixes the 'stuffed legion' recipie (#26735)
* Fixes stuffed legion food crafting

No longer relies on a null object for crafting, now uses appropriate indeterminate legion soul

* Delete food.dmi

* Fixes typo for Stuffed Legion

Fixes a typo with "stuffed legion" food not having a appropriate underscore like in the code "stuffed_legion"
2017-05-01 15:36:56 +02:00
Really-Good-Soda-Flavor 20ac81d9a5 A bunch of sparks to do_sparks (#26728)
* A bunch of sparks to do_sparks

* Whoops!
2017-05-01 09:35:18 -04:00
swindly db7b290351 changes mercury and lithium (#26731) 2017-05-01 09:34:42 -04:00
kevinz000 0d344cc29e Buffs jump boot dash speed (#26663) 2017-04-30 21:06:13 -03:00
bawhoppen 94d63eba9b Readds deepstorage w/ tweaks AND adds water bottles to vending machines (#26709) 2017-04-30 21:00:24 -03:00
Leo 89e60cb88f Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted (#26720) 2017-04-30 23:35:13 +02:00
Leo 8958aca8f9 Merge pull request #26719 from Cyberboss/patch-70
Fixes some null.add_reagents runtimes
2017-04-30 18:31:57 -03:00
Leo 2fca063698 Merge pull request #26715 from kevinz000/patch-136
Makes fire not able to become ice.
2017-04-30 14:22:26 -03:00
Leo 1250a1ff75 Merge pull request #26713 from Cyberboss/patch-69
[s] SDQL security patches
2017-04-30 13:30:27 -03:00
Leo 7fa3fb4fc8 Merge pull request #26680 from Cyberboss/mob_directory
Mob directory
2017-04-30 13:26:21 -03:00
Leo 87292bb007 Merge pull request #26691 from QualityVan/brainfixes1
Fixes changelings being unable to revive from death without a brain
2017-04-30 13:24:59 -03:00
Leo e6026080bb Merge pull request #26694 from QualityVan/brainfixes4
Fixes seeing the you are a brain! message during monkey transformation
2017-04-30 13:24:23 -03:00
Leo be4edbf8c3 Merge pull request #26706 from XDTM/TiredVoice
Removes Rest from Voice of God
2017-04-30 13:22:52 -03:00
Leo 1ef85a20ac Merge pull request #26712 from Cyberboss/patch-63
Fixes emitter sparks
2017-04-30 13:21:38 -03:00
kevinz000 f7cf00cf66 Update admin_investigate.dm 2017-04-30 07:55:27 -07:00
YakumoChen e6529d4952 Fixes spelling for Lavaland Syndicate (#26705)
* Fixes spelling for Lavaland Syndicate

* Update lavaland_ruin_code.dm
2017-04-30 02:13:15 -05:00
Cheridan 93d3c714f0 Merge pull request #26692 from QualityVan/brainfixes2
Fixes debraining messages showing up one place they shouldn't
2017-04-30 02:11:25 -05:00
Robustin f90b87ae99 The least surprising nerf: Null Crates & Emagged Plasma Export Bonus (#26670)
* You knew this was coming

* No
2017-04-29 16:04:55 -06:00
Cyberboss 4a49086849 Patches SDQL exploits that can return world ref (#26689) 2017-04-29 23:59:03 +02:00
Leo 64d7b1af99 Merge pull request #26693 from QualityVan/brainfixes3
Prevents GODMODE mobs from dying to organ removal
2017-04-29 18:55:10 -03:00
Joan Lung 920c2d00cc Status effects are actually deleted/handled when the mob is deleted (#26662) 2017-04-29 18:50:12 -03:00
Leo 4bf5910e8e Merge pull request #26676 from Cyberboss/patch-56
Fix SDQL vars again
2017-04-29 18:35:36 -03:00
Cyberboss d7469744ff Fixes some null.add_reagents runtimes 2017-04-29 16:09:57 -04:00
kevinz000 ed6a69b7c3 Update LINDA_fire.dm 2017-04-29 10:24:34 -07:00
Cyberboss 0e0943837a Fixed Dsay always causing a disk read (#26685) 2017-04-29 12:23:39 -04:00
Cyberboss e935f3e557 Patches potential SDQL permissions elevation 2017-04-29 11:43:24 -04:00
Cyberboss 66f606126c Fixes emitter sparks 2017-04-29 11:33:26 -04:00
XDTM daf10acbf1 Removes Rest from Voice of God 2017-04-29 10:53:50 +02:00
Profakos e9eeadca1a Old ore processor cleanup (#26398)
* Processing machine cleanups, can smelt bluespace and titanium

* Another forceMove

* Lack of typing

* Rewrite using materials container, a target proc for container's release sheet procs

* Alloys

* The dme

* Nulls references on Destroy

* Makes the smelter infinitely large, like before
2017-04-29 20:45:32 +12:00
Robustin 498559db33 Cult Construct Non-Balance Update (#26598)
* Adds Construct HUD

* Update _defines.dm

* Construct health icons

* Update tgstation.dme

* Update constructs.dm

* construct glow

* Nightvision

* Add files via upload

* Update constructs.dm

* HUD fix

* updated icon names

* Update screen_objects.dm

* here goes nothing

* Throwing code at the wall and seeing what sticks

* Update constructs.dm

* Update constructs.dm

* Update constructs.dm

* wew

* empty space memes

* Update constructs.dm

* Update and rename constructs.dm to construct.dm

* Update construct.dm

* Filename memes

* Update constructs.dm

* update

* Finished and tested
2017-04-29 14:10:41 +12:00
oranges 7cfef759af Merge pull request #26527 from QualityVan/mutanthands
Zombie/limb refactors/fixes
2017-04-29 14:03:53 +12:00
oranges 08c3699461 Merge pull request #26536 from coiax/changes-traps
Nerfs and buffs The Traps
2017-04-29 14:03:30 +12:00