Commit Graph

10829 Commits

Author SHA1 Message Date
Jordan Brown
f0b26dd87b Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2
Actually fixes broken accesses
2018-02-11 16:47:48 -05:00
Jordan Brown
47ed29cb5b Merge pull request #35514 from ShizCalev/ghost-role-syndi-access
Fixes wrong ID for syndicate ghost roles
2018-02-11 16:34:17 -05:00
AnturK
c3c9f4c668 Highlander antag datum (#35519)
* Highlander antag datum

* Forgot debug line

* Also this
2018-02-11 16:32:06 -05:00
MoreRobustThanYou
4268e48880 Makes urinal cakes more realistic (#35515)
* Add files via upload

* Makes urinal cakes blue

* Add files via upload

* Delete urinalcake_squish.png
2018-02-11 16:29:38 -05:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456)
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
2018-02-11 16:06:12 +13:00
Dax Dupont
f658044e9b Adds the fake honking emag to the arcade. (#35457)
* Adds the fake honking emag to the arcade

* duuu

* Henk

* it's fake now

* Merge branch 'master' of https://github.com/tgstation/tgstation into prank

* How the fuck would replacing wirecutters with an emag even work

* saddsadsdsadsdsaadgfdsgghf

* k
2018-02-10 19:03:51 -05:00
Mokiros
61fd8fecbc Buildable and upgradable All-In-One Grinder (#35451)
Circuit is in "Biological Processing" techweb node
2018-02-10 19:00:06 -05:00
uraniummeltdown
ac9964be70 Buildable Shuttle/Plastitanium Windows (#35376)
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
2018-02-10 18:49:43 -05:00
KorPhaeron
1270132798 Mining sentience upgrade grants minebots a radio and ID (#35235)
* Minebots get mining radio+ID card

* Updates radio implant paths
2018-02-10 18:39:58 -05:00
MoreRobustThanYou
53422e4088 Adds a SCP-294 ruin (#35188)
* Add a SCP-294 ruin

* Convert map to TGM

* Add hostile mobs, random traps

* Add nanites

* Now now, we don't wanna blow ourselves up, do we, Jimmy?

* Blacklist blob chems

* make it harder

* Remove statue; use can_synth; name finder

* Fixup scp_294.dmm

* Fix traps

* Fix traps

* Add to POI list

* TGM-ize

* ruin remap

* damn tags

* Re-add mimics and traps

* New sprites by @militaires!

* Fix trap spawners spawning ctf protection thingys

* map fixes

* New sprite!
2018-02-10 18:39:27 -05:00
ShizCalev
a5a39ba42b Actually fixes broken accesses 2018-02-10 17:21:03 -05:00
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