Commit Graph

19443 Commits

Author SHA1 Message Date
GunHog 10ab63dd58 Adds patting! (#23989)
* Adds patting

You may now hug someone while aiming at the head, eyes or mouth to give
them a friendly pat!

* I'm a little snowflake short and spout

Down came the rain and washed poor spidey out
2017-02-13 22:42:28 +13:00
coiax 70e66069b8 Admin tool, the life candle! (#23955)
* Admin tool, the life candle!

🆑 coiax
add: Added an admin only tool, the life candle. Touch the candle, and
when you die, you'll respawn shortly afterwards. Touch it again to stop.
Used for testing, thunderdome brawls and good old fashioned memery.
/🆑

Requested.

* Bug fixes

* Moves life_candle.dm
2017-02-13 21:12:13 +13:00
oranges 9add09a667 Merge pull request #23957 from swindly/soda_premium
Adds Nuka Cola as a premium item for Robust Softdrinks
2017-02-13 21:07:29 +13:00
oranges a6a781e827 Merge pull request #23960 from ChangelingRain/bubblegum
Bubblegum is faster
2017-02-13 21:06:37 +13:00
cy294 dabf5fee42 Fixes an exploit regarding Security Bots (#24009)
* Fixes an exploit where you are able kill Beepsky with your fists while in disarm intent.

* Update secbot.dm

* Update secbot.dm
2017-02-13 08:48:48 +01:00
Cyberboss 2e143e1c2d Fixes simple_animals not deathrattling (#24007) 2017-02-13 08:47:49 +01:00
coiax 2253bd4f4b Fixes fried items always being tiny (#23982)
Fixes #23949.

🆑 coiax
fix: Fried foods no longer shrink to minature size.
/🆑
2017-02-13 08:39:38 +01:00
Joan Lung 9c9d053e76 Merge pull request #24027 from Cyberboss/FixesTheWorstShitEver
Fixes mobs not picking up with forceMove
2017-02-12 15:34:12 -05:00
Cyberboss 6a30c7adb7 Fix riding_datum runtimes (#23976) 2017-02-12 20:37:21 +01:00
Cyberboss c1ba824738 Fixes mobs not picking up with forceMove 2017-02-12 12:21:08 -05:00
SweaterKittens 8adb1e728a Reduces Plasmaman heat-based damage multiplier from 2x to 1.5x (#23961) 2017-02-12 14:48:22 +01:00
GunHog 367454c7eb Aux Mining Base Construction Console (#23683)
* Aux Mining Base Construction Console

- Adds the base construction console (code only)
- Adds the consoles to the maps and moves things around a little.

* Makes eye visible

Hopefully this actually makes the eye visible to all players when the
console is in use.

* Map Fix

I hope this fixes the map issue!

* Map conflict fixes.

I hate maps. Maps suck. They are so annoying and evil. All I know is
pain.

* Turrets and tweaks

- The base console may now build up to four plasma defense turrets,
calibrated to only attack hostile mobs, never humans.

- Added construction sounds for building things with the base console.

- Fixed a bug with tiny fans placement

* Two new sprites

Credit to chanoc1

* Construction Drone Sprite!

- Adds the construction drone sprite to replace the visible [ ]
indicator!
- Small tweaks and fixes to it!
Sprites by WJohnston!

* Turret flavor

- Added fluff text to the turrets!
2017-02-12 13:10:10 +01:00
Cheridan da77946b2a Merge pull request #23963 from RandomMarine/dontgetrektcomrade
Mother Russia Bleeds shuttle.
2017-02-12 04:05:32 -06:00
Cheridan 74588b703b Merge pull request #23946 from coiax/hug-box-2
Clown internals box is now a box of hugs
2017-02-12 02:43:56 -06:00
AnturK 54c51a5510 Poison Pen (#23778)
* Poison Pen

* Fixup

* Logs

* Fix & proper name
2017-02-12 14:17:47 +13:00
kevinz000 a4914b6728 [READY]slight tweak to make adminbuse/varediting better (#23894)
* Update aimed.dm

* Update aimed.dm

* Update aimed.dm

* Update aimed.dm
2017-02-12 12:50:49 +13:00
Joan Lung 36c392948a Merge pull request #23940 from lzimann/namedarg
Allows in-game proccalls to have named arguments
2017-02-11 13:41:45 -05:00
RandomMarine f663e54dd2 Adds Mother Russia Bleeds shuttle 2017-02-10 22:08:58 -08:00
Lzimann db19d6b2d0 Named args will now go to the end of the list 2017-02-11 02:14:01 -02:00
Joan Lung 9fbd5d7bb1 Bubblegum is faster 2017-02-10 23:08:13 -05:00
kevinz000 fbf9e46e60 Fix brains breaking checkantags 2017-02-11 16:23:57 +13:00
swindly 6fc0d8c0b6 adds nuka cola to soft drinks 2017-02-10 21:47:59 -05:00
kevinz000 3762403553 [READY]Blacklists tools, part exchangers, and beakers from the deep fryer. Allows them to be unanchored, and deconstructed (#23889)
* Update deep_fryer.dm

* Update deep_fryer.dm

* Update deep_fryer.dm

* Update deep_fryer.dm

* Update deep_fryer.dm

* Update deep_fryer.dm

* Update deep_fryer.dm

* Update deep_fryer.dm

* Update deep_fryer.dm

* Update deep_fryer.dm
2017-02-11 15:27:47 +13:00
oranges 8cda3a7675 Merge pull request #23891 from Jordie0608/errorlocationspecifiedisnotavalidUNCpath
Adds distinct server sql name config
2017-02-11 15:26:20 +13:00
Joan Lung be54c89258 Merge pull request #23788 from KorPhaeron/theworstshuttle
Arena Shuttle
2017-02-10 18:54:28 -05:00
oranges 59930f2a56 Merge pull request #23918 from lzimann/jetchange
Hardsuit built-in jetpacks no longer have a speed boost
2017-02-11 12:25:54 +13:00
Lzimann 2ea2c44504 Removes positional var 2017-02-10 20:31:17 -02:00
Jack Edge 63dc0d9366 Clown internals box is now a box of hugs
🆑 coiax
add: The clown's survival/internals box is now a box of hugs. Dawww.
/🆑

Was suggested. Means the clown revolver (coming in a box of hugs) isn't
as meta'able.
2017-02-10 20:24:03 +00:00
Lzimann bf921c635f Allows in-game proccalls to have named arguments 2017-02-10 16:40:28 -02:00
KorPhaeron f1374d1730 Merge branch 'master' into theworstshuttle 2017-02-10 11:27:34 -06:00
coiax 51c14939b8 Admin only event: Station-wide Human-level Intelligence (#23873)
🆑 coiax
add: Added a new admin only event: Station-wide Human-level
Intelligence. Like the random animal intelligence event, but affecting
as many animals as there are ghosties.
/🆑

Will lead to mouse and cockroach uprisings. Also a good solution for
salty ghosts wanting to be part of an ERT. Give them a random mouse in
manit, and watch them attempt to valid people anyway.
2017-02-10 10:08:19 -06:00
coiax 331763d0c4 Revert "Soapstones now have a fixed vocabulary (and rating system!)" (#23909) 2017-02-10 10:06:14 -06:00
coiax 380334259e Luxury shuttle changes (#23903)
🆑 coiax
add: The Luxury Shuttle grabs cash in your wallet and backpack, and
shares approval between the entrance gates.
/🆑

- Luxury Shuttle grabbing cash in your wallet is self explanatory,
although we lack a "proper" cash spending system on /tg/.
2017-02-10 10:03:39 -06:00
Cheridan 530d4aa887 Merge pull request #23883 from coiax/hug-box
Reverse revolver now comes in a box of hugs
2017-02-10 02:14:45 -06:00
Core0verload 4b1eed0c8e You can now emag the escape pods to launch them (#23815)
* You can now emag the escape pods to launch them in any code

* micro optimisation
2017-02-10 20:35:18 +13:00
kevinz000 44e7fd3a9c [READY]Check Antagonist player count (#23854)
* Update player_panel.dm

* Update player_panel.dm

* Update player_panel.dm

* Update player_panel.dm

* ok.

* misdents

* spelling

* my fucking spelling man
2017-02-10 20:33:01 +13:00
oranges 51e1d518cb Merge pull request #23855 from Core0verload/shuttle_stat
Moves shuttle name to status screen
2017-02-10 20:31:18 +13:00
kevinz000 cb1940b922 Prevents enchanted boltaction/arcanebarrages from being unloaded (#23859)
* Update shotgun.dm

* Update shotgun.dm
2017-02-10 20:30:58 +13:00
oranges e7e9a84d9a Merge pull request #23876 from ChangelingRain/arkonly
Clockwork Cults must always construct and activate the Ark
2017-02-10 20:28:48 +13:00
Joan Lung c4ae453aed Unfastening objects will now check constantly during the do_after (#23881)
* Unfastening objects will now check constantly during the do_after for if you can

* .
2017-02-10 20:25:32 +13:00
kevinz000 70dba6e3c8 [READY]Allows people to ride around on cyborgs (#23440)
* cyborg_riding_revival

* Knockoff Damage

* ...

* Restraint checks

* Update silicon_defense.dm

* Fixes throwing humans through a wall...

* no cyborg stacks

* wew wew human harm wew wew

* Fix

* ...

* FOR_THE_LOVE_OF_GOD_WILL_YOU_JUST_FIX_PLEASE

* armchecks

* ... What?

* Fixes..

* .

* honk

* stuffs

* fixes

* fine basilcuck

* fixes

* done

* eMAAAGS

* f i x e s

* this better fucking fix reee ;-;

* fix?!

* all_ready

* hm.

* fixes

* fixes...

* woops

* fixes

* defines

* ready
2017-02-10 20:22:40 +13:00
kevinz000 c97e0041c6 [READY]Makes the reactive tesla armor actually shoot out lightning (#23719)
* lel

* Update armor.dm

* Update armor.dm

* Update armor.dm

* Update energy_ball.dm

* Update living_defense.dm

* Update carbon_defense.dm

* Update human_defense.dm

* Update carbon_defense.dm

* Update armor.dm
2017-02-10 20:19:29 +13:00
Cyberboss 8e1351a06f Faster, non-blocking world init (#23136)
* Moves turf New calls to Initialize

* Much faster

* Fixed

* Makes add_to_active queue up before SSair is initialized

* Remove active queuing

* And the proc

* Move the check

* Fix some shit

* F U C K T U R F S

* Necessary

* Unnecessary

* SHUT THE FUCK UP

* Panic mode hurts the code

* Such a

* Simple answer

* A well thought out plan

* /turf/open optimization

* Undo the warning suppression now that it's fixed

* Fixes lava typecaching badly

* Added late initialization

* Make the atmos offenders late initialize

* Add extra logging

* GLABALS

* Better solution for trying to activate w/o air

* Further base calling copypasta

* Gates, guards, gorans

* Small doc fix

* Do the faster

* T U R F   V A R   P E R S I S T E N C E

* The solution is always so simple

* The (hopefully) final nail in the coffin
2017-02-10 16:53:08 +13:00
Lzimann a4d1be75dd Built-in jetpacks no longer have a speed boost 2017-02-09 21:28:59 -02:00
Cyberboss 3e3b6a4515 Fixes simple_animals NOT deathgasping (#23862) 2017-02-09 16:07:41 -06:00
Xhuis ecf5cc62af Hotfixes the reverse revolver appearing in surplus crates (#23872)
* Hotfixes the reverse revolver appearing in surplus crates

* that was the real prank
2017-02-09 16:07:03 -06:00
KorPhaeron c7bd42a278 Fixes the lighting situation in the shuttle 2017-02-09 10:25:51 -06:00
chanoc1 c826771c75 Changes the Salt Shaker and the Pepper Mill sprites (#23809)
* initial changing of the salt and pepper sprites

* made the new sprites less "battery-like", more of a color overhaul

* initial changing of the emergency tanks

* woops, i accidently pushed to the wrong branch, alls good

* added sprite for empty shaker

* the salt and pepper shakers now have empty sprites when they run out of reagent
2017-02-09 20:33:14 +13:00
oranges 2ff5f7d8d7 Merge pull request #23816 from AnturK/apeescape
Agressive monkeys won't attack each other.
2017-02-09 20:32:56 +13:00
Cyberboss 81b4ae8281 Fixes some shit with paper and planes (#23834)
* LAZYCLEARLIST

* Paper and plane folding and stamping fixes
2017-02-09 20:31:34 +13:00