Commit Graph

6826 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
AnturK
c3c9f4c668 Highlander antag datum (#35519)
* Highlander antag datum

* Forgot debug line

* Also this
2018-02-11 16:32:06 -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
ShizCalev
a5a39ba42b Actually fixes broken accesses 2018-02-10 17:21:03 -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
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
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
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
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
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
Dax Dupont
aad1a138e8 Unfucks handcuff code 2018-02-05 16:44:16 +01: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
Cruix
47a57f63c5 Added transit tubes to the RPD (#35074) 2018-02-04 02:44:59 -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
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
XDTM
945051524c Makes slime scanning more readable 2018-02-03 23:02:12 +01: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
Ashe Higgs
6ba865b112 makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#34888)
* traps patch

* flags!
2018-02-02 11:14:38 +01:00
cebutris
8c50239f3a Changes stunbaton battery examine text to use [src] (#35153) 2018-01-31 20:13:42 -02:00
Leo
1fe474c9c8 Merge pull request #35136 from uraniummeltdown/correcttheref
Corrects Some \ref Macros
2018-01-31 13:29:59 -02:00
Robustin
418a8c0112 Cult Update (#33810)
* Cult overhaul
2018-01-30 21:59:03 +02:00
uraniummeltdown
57fc27f7f7 corrects some \ref macros 2018-01-30 15:38:50 +05:00
Ashe Higgs
122fb29280 Adds wall-attached defibrillator mounts (#34545)
* Adds defibrillator mounts

* Update medical.dm

* Cyberboss requests, take two

* Requests by AnturK
2018-01-30 08:33:52 +01:00
Dax Dupont
eca04302ec Expand Cyborg (#34958)
* Expand Cyborg

* i ded pls nerf

* Oh sheet
2018-01-29 18:30:58 -05:00
Ashe Higgs
d6cae1f6e1 Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC (#34849)
* Do you want to play a game?

* removes leftover code from earlier dev

* Some things

* optimizations, from the heart, for the soul
2018-01-29 21:33:40 +01:00
PKPenguin321
fa08aaf7fe adds extendohands (#34599)
* adds extendohands

* adds to arcade prizes, crafting menu
also adds an alternate named/desc'd version for arcade prizes

* removes the else

* actual conflict fix instead of accidental revert

* ACME -> acme
2018-01-29 18:36:35 +02:00
XDTM
3ecf74f1fd Xenobiology consoles can now scan slimes and apply potions (#34748)
* Xenobiology consoles can now scan slimes and apply potions

* no smack
2018-01-29 10:59:13 +01:00
ACCount
27481363c1 Adds new tool helpers: welder_act and tool_act (#34961)
* Adds new tool helpers: welder_act and tool_act

* New tool flags to make using tool flags as list indexes possible

* Simplifies a return
2018-01-28 14:54:42 -05:00
81Denton
eaa3a07597 [Ready] Rebalances Chameleon Kits for lowpop (#34972)
* 🆑 Denton, Anonmare, kevinz000
tweak: Removed the player minimum on syndicate chameleon kits.
rscdel: To compensate, regular chameleon kits no longer contain noslip shoes.
tweak: Reduced the chameleon kit price to 2 TC (same total price for kit+noslips).
/🆑

Chameleon kits were given a minimum player limit due to the noslips that come with them.
This PR removes the player limit as well as the noslips, but lowers the TC cost by 2.

That way, lowpop tators can have disguises while highpop has the same total price for the old chameleon+noslips combo.

* Created a shoes/chameleon/noslip subtype and moved the NOSLIP_1 flag to it. Made sure that all other regular noslips refer to the new subtype.
2018-01-28 01:29:04 +02:00
vuonojenmustaturska
d72ef0a95b Fixes pneumatic cannon contents deletion (#34884)
* Fix pneumatic cannon contents deletion

* honk

* Update pneumaticCannon.dm
2018-01-26 11:36:42 +01:00
vuonojenmustaturska
2871b70733 /obj/item var cleanup (#34909)
* draft 1

* Update energy.dm

* Update twohanded.dm

* Update weaponry.dm

* Update ninja_stars.dm

* Update cult_items.dm
2018-01-25 22:44:32 -05:00