Commit Graph

10818 Commits

Author SHA1 Message Date
ShizCalev 9dfeb83ebd others 2018-02-10 15:24:58 -05:00
Jordan Brown f5ff686404 Merge pull request #35424 from ShizCalev/var-cleanup
Replaces some var values with defines
2018-02-10 12:10:40 -05:00
ShizCalev f7fe600540 Cleans up vars with defines 2018-02-09 00:20:41 -05:00
Jordan Brown 6d3721398b Merge pull request #35443 from Shirbu/patch-1
Fixes crushed sodacans not giving aluminium
2018-02-09 00:05:06 -05:00
Jordan Brown ca3976fc1d Merge pull request #35435 from optimumtact/mrtyhasahorsecunt
Revert "Adds the saltmine shuttle. (#35369)"
2018-02-09 00:03:36 -05:00
vuonojenmustaturska 1c8e450f15 Fixes geiger counters on engiborgs (#35423)
* a commit

* Update geiger_counter.dm
2018-02-08 12:21:06 -05:00
Jordan Brown 145b83e11e Merge pull request #35418 from kevinz000/patch-445
Allows projectiles to pass portals
2018-02-08 10:03:29 -05:00
vuonojenmustaturska 8bed4a4d10 Fix intendation on embedding datum initializer (#35447) 2018-02-08 11:58:23 +01:00
oranges a0624c5909 Merge pull request #35346 from DaxDupont/kinky-cuffs
Fixes cyborg related cuffing issues
2018-02-08 22:07:07 +13:00
Shirbu c5f512910f Fixes crushed sodacans not giving aluminium
This is my first PR, so, might not really work, but I checked the reagents code, and I'm pretty sure its aluminium, not aluminum in the code. Hopefully this will finally work, and we can begin to revive ghetto chemistry.
2018-02-08 00:00:56 -08:00
Jordan Brown 364bc96834 Merge pull request #35409 from epochayur/master
Belts now have inhand sprites
2018-02-08 00:47:33 -05:00
oranges b1f301b39b Revert "Adds the saltmine shuttle. (#35369)"
This reverts commit c7ee29b5b0.
2018-02-08 01:49:57 +00:00
ShizCalev dc862ad931 Var cleanup and map fixes 2018-02-07 17:10:22 -05:00
kevinz000 a8dfb1845d portal 2 2018-02-07 07:48:50 -08:00
vuonojenmustaturska cfc12f157f Merge pull request #35393 from optimumtact/blueprintlogging
blueprint area changes are now logged to the game log
2018-02-07 15:43:37 +02:00
Dax Dupont c7ee29b5b0 Adds the saltmine shuttle. (#35369)
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
2018-02-07 15:16:54 +02:00
vuonojenmustaturska dd9ae40cf7 Merge pull request #35360 from Robustin/blackmirror
Removes synths and androids from magic mirror
2018-02-07 12:41:12 +02:00
vuonojenmustaturska a1c73db03c Merge pull request #35363 from Xhuis/chair_nerf
Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
2018-02-07 12:38:32 +02:00
Epoc 431bd05207 put lefthard/righthand directories in belts.dm 2018-02-07 00:06:00 -08:00
ShiggyDiggyDo ed01b8c7f5 Toy Daggers! (#35352)
* Adds Toy Daggers

* Adds Toy Daggers to the Arcade Machine

* Oh fuck
2018-02-07 02:05:11 -05:00
oranges 60f8fa4936 blueprint area changes are now logged to the game log 2018-02-06 22:39:41 +00:00
BordListian c582b897da Forces gases to obey certain laws of nature (#35277)
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.

* - Redundant parenthesis
- I'm going back to sleep

* - Sends fire and fusion to jail

* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors

* - Reverted the tritium burn changes because apparently I'm dumb

* - FUCK

* - Fixes division by zero when fusion has no impurities

* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs

* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
2018-02-06 15:16:26 -06:00
Jordan Brown bd489f1aff Merge pull request #35349 from DaxDupont/ifuckinghatethese
Moves the pocket protector to lockers instead of on the uniform.
2018-02-06 11:45:19 -05:00
kevinz000 a12f4491aa [READY]Explosive Hot Potatoes - Service department job restricted traitor item (#34741)
* Hot Potato!

* Hot Potato!
2018-02-06 08:37:25 -05:00
ACCount 100c4b6114 Adds new helper: use_tool, shakes things up in tool code (#35095)
* small changes

* Adds a use_tool helper and changes some tools to use it

* Ports most tool operations to use_tool

* Converts more tool operations to use_tool and tool_act

* Changes some things to default_unfasten_wrench

* Improves tool_behavior support in mech construction

* Code review memes

* Fixes all instant use_tool calls failing

* Code improvements

* merge fixes
2018-02-06 11:02:53 +01:00
nicbn 9348ad9aad Fixes bloodpack sprite issues (#35288)
* Fixes bloodpacks with question marks

* .

* .

* .
2018-02-05 20:21:13 -05:00
vuonojenmustaturska c4fd8715a5 Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#35291)
* Ore Stacking

* honk

* honk

* component memes

* honk2

* fix overlay off-by-1, sheet singular names

* Give the ores more descriptive names since sheets also have

* whoops debug memes

* atom editor memes

* fixes

* snowdin fix
2018-02-05 22:27:35 +01:00
Xhuis 48de810fbd Kills tactical brass chairs 2018-02-05 15:51:56 -05:00
Robustin 03237ad529 More mirror species blacklisted 2018-02-05 14:22:06 -05:00
Dax Dupont d874e90906 Moves the pocket protector to lockers instead of on uniform 2018-02-05 17:29:27 +01:00
Dax Dupont aad1a138e8 Unfucks handcuff code 2018-02-05 16:44:16 +01:00
MMMiracles 6c2db52ab3 Snowdin 2.0 (#35000)
* wrah wah wah waaaah

* fences, new mountain turfs, sprites, top-side finished, misc stuff

* quick fix

* cut my life into pieces, this is my last resort

* lots of work done to the underground segment, more fluff bits and topside work

* removing depreciated bits and tgm conversion

* step_off

* damn these dirty VARS

* changes n stuff

* wanna build a plasmaman?

* decals commit fix

* map detailing, loot spawns, plasma miners, cyberboss changes, plasma lava turning people into plasmamen

* tgm conversion

* new barricade sprites, final map edits before testing

* mountain wall fix

* Update snow_storm.dm

i ate too mucha pasta
2018-02-05 17:09:34 +02:00
Leo 61609a0c70 Merge pull request #35274 from XDTM/SlimeScan
Makes slime scanning more readable
2018-02-05 02:10:48 -02:00
KorPhaeron d962858116 Fixes smugglers satchels being able to refresh items forever (#35270) 2018-02-05 02:08:17 -02:00
ShizCalev ee18d6f8e2 Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#34907)
* Cleanup

* .

* Synced special_role & factions with role defines

* Revert

* more cleanup

* fix
2018-02-04 03:03:34 -06:00
Buggy123 b2c456df73 Morgues now beep if the mob is clonable. (#34622) 2018-02-04 02:57:57 -06:00
Iamgoofball 725df4bd9b Buffs Clogged Vents (#34949)
* Buffs Clogged Vents

🆑 Iamgoofball
feature: Clogged Vents now has some teeth
/🆑

This was the only part of GoofEvents players liked

* Update effects_foam.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm
2018-02-04 02:51:47 -06:00
Cruix 47a57f63c5 Added transit tubes to the RPD (#35074) 2018-02-04 02:44:59 -06:00
nicbn dc09b1763e Adds tiny shards (#35070)
* Adds tiny shards

* .

* .

* .

* .

* .

* .
2018-02-04 02:40:01 -06:00
Incoming5643 a3e6885582 Moves the rarely utilized bar drink flinging ability from an intrinsic bartenders are born with to an extrinsic book that anyone can learn the art from. Bartenders start with the book but it's also available from cargo. Also allows the ability to toggle where as previously bartenders were just stuck with it. (#35165) 2018-02-04 02:20:30 -06:00
Robustin fc5c1fdf95 Fixes Vape Pen (e-cig) reagent spam (#35182)
* Changed smoke machine argument

* Fixed e-cig reagent spam

* Update cigs_lighters.dm

* merge conflict

* the fuck is this merge conflict
2018-02-04 02:14:34 -06:00
Jittai df1a99ed8d [READY] Fixes de-initialization of cleanables-ash (#35191)
* Fixes de-initialization of cleanables-ash

* boop

* :x

* better execution

* prevent pile-up

* special ash

* comment cleanup

* cleanup 2
2018-02-04 02:12:22 -06:00
ShiggyDiggyDo baa6bba7e0 Steampunk Watches! (#35187)
* Adds steampunk watches

* Adds steampunk watches to arcade machines

* The steampunk watch can now play a noise!
2018-02-04 02:07:10 -06:00
Slignerd f5046f86ec Moves the spare ID inside the captain's locker (#35219)
* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)
2018-02-04 02:01:33 -06:00
ShizCalev 34897d8709 Removed tripAI landmark (#35256) 2018-02-04 01:13:40 -05:00
ShizCalev 50123b1e52 Allows blobs to destroy decals 2018-02-03 21:21:15 -06:00
XDTM 945051524c Makes slime scanning more readable 2018-02-03 23:02:12 +01:00
Tad Hardesty cc43ae9b33 Remove revenantspawn landmark from code (#35238) 2018-02-03 14:10:05 -05:00
ExcessiveUseOfCobblestone 791f364a62 Update morgue.dm (#35227) 2018-02-02 13:44:18 -05:00
Epoc fd73034111 Soap now has inhand sprites (#35159)
* Delete items_lefthand.dmi

* Add files via upload

* Delete items_righthand.dmi

* Add files via upload

* Delete custodial_lefthand.dmi

* Delete custodial_righthand.dmi

* Add files via upload

* Delete items_lefthand.dmi

* Delete items_righthand.dmi

* Add files via upload

* Update clown_items.dm
2018-02-02 11:56:04 +01:00