Commit Graph

11252 Commits

Author SHA1 Message Date
Jordan Brown
a4a6d3ec77 Merge pull request #38549 from AutomaticFrenzy/patch/vending-machines
Improve how vending machine restocking works
2018-06-19 19:44:22 -04:00
Jordan Brown
84a85a5a3a Merge pull request #38574 from ninjanomnom/glob-signals
Global component signals
2018-06-19 18:18:11 -04:00
Tad Hardesty
eaf8bc3b42 Merge remote-tracking branch 'upstream/master' into patch/vending-machines 2018-06-19 13:07:13 -07:00
Irafas
fc14312f35 PDA can be ctrl-clicked to remove the item in its pen slot (#38577)
* Makes pens ez to remove from pda

Players can now ctrl click on the PDA to remove the pen without having to remove the ID first.

* added instructions when examined.

Like how it tells the user they can use alt-click to remove contents, it now says they can use ctrl-click to remove items from the pen slot.

* PDA can now be dragged without dropping the pen.

When ctrl-clicked it now checks to see if the PDA is on a turf and will only output the pen if its not.

* quick change to examine text.

* comma

* Improved the examine
2018-06-19 10:49:04 -04:00
JStheguy
4ca07f7cf2 [READY] Helps data disks stop being unemployed (#38319)
* data cards actually have a function now

* Adds data cards to the IC printer for real rea

* more cards, less shitty code

* how the fuck did I miss that

adds a missing ..()

* wait wrong use of ..() fuck
2018-06-19 16:22:59 +02:00
Jordan Brown
f8dd1dda85 Fix some shuttle chair stuff (#38557)
* Fix shuttle chair stuff

* Remove redundancy
2018-06-19 02:29:38 -04:00
Jordan Brown
cf7e8aa9ec Qdels queries, adds sleep safety checks, DBcore checks for leaks (#38363)
* Qdels all queries, adds sleep handling

* DB Core messages admins about undeleted queries

* Compile fixes. Adds missing set waitfor

* Remove world/New shennanigans. Add DBQuery/BlockingExecute()

* Less spammy notifications to admins about undeleted queries

* Increase dbcore fire time to 1 minute

* Upgrade undeleted query warning

* Better place of death

* Fix build

* Remove BlockingExecute, see BSQL PR for why

* Yep, missed that one.

* Psyche, that's the WRONG QUERY!!
2018-06-18 22:48:35 +03:00
ninjanomnom
71e2354d48 Adds global signals and a silly example use case 2018-06-18 03:06:09 -04:00
81Denton
3125b2ebba Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533)
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
2018-06-17 17:50:21 -07:00
Tlaltecuhtli
eaa0b551df Advanced foam extinguisers (#38270)
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
2018-06-17 13:37:34 -07:00
fludd12
9f564d539b Adds New Shuttle Chairs (#38539)
* I'm crashing this shuttle with no survivors.

* comma comma comma comma comma chameleon
2018-06-17 12:16:48 -04:00
Jordan Brown
0a7fb53a3c Merge pull request #38518 from AutomaticFrenzy/patch/uplinks
Block default interact when opening an unlocked uplink
2018-06-17 12:13:56 -04:00
Tad Hardesty
5780784eeb Fix non-secure windoors not supporting One Required access mode (#38543) 2018-06-17 19:10:57 +03:00
ShizCalev
6d558b6bcf puts a / at the start of some obj instances (#38545) 2018-06-17 19:10:06 +03:00
Tad Hardesty
255a8d029c Fix Donksoft vending machines having multiple restocking units 2018-06-16 23:56:31 -07:00
Tad Hardesty
870ac15480 Improve how vending machine restocking works 2018-06-16 23:02:41 -07:00
Jordan Brown
175a366ceb Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders
Fix being able to pull mirage borders, others
2018-06-16 16:49:02 -04:00
Jordan Brown
a8ffac294d Merge pull request #38499 from AnturK/runtimeH
Fixes Pubby mapedit.
2018-06-16 16:48:02 -04:00
AnturK
978bd9227c Cleanup + warning on wrong pathtype 2018-06-16 11:18:04 +02:00
Tad Hardesty
695f2a3af5 [s] Prevent unbreakable ladders from being moved by shuttles (#38477)
* Prevent unbreakable ladders from being moved by shuttles

* Disconnect ladders before and reconnect them after shuttle move
2018-06-15 22:43:42 -04:00
Tad Hardesty
3c03f9a383 Move PDA interface to interact from attack_hand 2018-06-15 19:36:45 -07:00
Tad Hardesty
d1161404db Change nuclear uplinks to not be radios 2018-06-15 19:36:44 -07:00
Dax Dupont
3a81a65dde Fixes missing creampies (#38490) 2018-06-15 20:39:25 +03:00
AnturK
1a1aa6f127 Actually let's just add this functionality. 2018-06-15 09:24:17 +02:00
Tad Hardesty
2f8f166d88 Merge pull request #38287 from ninjanomnom/signal-define
Use a define to speed up sending signals to datums with no signals
2018-06-14 22:17:01 -07:00
Tad Hardesty
0bac7887b1 Fix being able to pull mirage borders, others 2018-06-14 21:39:32 -07:00
Jordan Brown
4988b496a2 Merge pull request #38409 from ShizCalev/grenade-fix
[s] Improved chem grenade logging
2018-06-14 15:33:24 -04:00
Jordan Brown
c5a1313f74 Merge pull request #38458 from Tlaltecuhtli/patch-46
you can make shoes with leather now
2018-06-14 15:28:32 -04:00
ShizCalev
2f461e6215 pretty 2018-06-14 07:05:25 -04:00
ShizCalev
03816b828c fuk 2018-06-14 05:27:20 -04:00
Nich
67ff23a9a1 Makes the TEG deconstructable (#38056)
* Directional icons

* and the code for the circulator icons

* deconstruction and usability of TEG/circulator

makes both deconstructable, unanchorable and able to check for their counterparts. Also improves the TEG so it doesn't need to be facing south, and allows circulators to be on either side

* circuitboard and a pixel_x/y issue

* and adds rotation

* tool_act and circulator defines

* components!

* Update circulator.dm

* Update generator.dm

* Adds disconnectFromGenerator to the circulator's destroy
2018-06-14 11:20:42 +02:00
ninjanomnom
d483ff3ef0 Regexes
`([^_\.])SendSignal\((.+?)\)` -> `\1SEND_SIGNAL(src, \2)`
`([\.\w]+?)\.SendSignal\((.+?)\)` -> `SEND_SIGNAL(\1, \2)`
2018-06-13 19:19:23 -04:00
Tlaltecuhtli
fd6812acf0 sdasd 2018-06-13 14:38:24 +02:00
cacogen
5c7613c4ff You can see what other people eat or drink (#38395)
* Makes drinking message visible to others

* Makes swallow message visible to other people

* Adds visible messages for eating

* Update snacks.dm

* Update snacks.dm

* Update objs.dm

* Update drinkingglass.dm

* Update pen.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinks.dm

* Update condiment.dm

* Update snacks.dm

* Adds a few extra reagents to the borg shaker

* Update drinkingglass.dm

* Update drinkingglass.dm

* removes blood as a borg shaker reagent
2018-06-13 05:34:54 -04:00
Mickyan
eb9fa0d8f5 Add pacifism check for screwdriver/bottle attacks (#38416) 2018-06-13 00:22:26 -07:00
oranges
fb6a61b5cb Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-12 11:48:21 +12:00
oranges
de389ee586 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox
[s] Fix lockboxes not actually being locked
2018-06-12 11:44:24 +12:00
ShizCalev
c1617ef9a0 Improved chem grenade logging 2018-06-11 00:11:44 -04:00
kevinz000
bddba58241 Readds actual fun to admins throwing around drop pods (#38374)
* Readds fun

* Fun
2018-06-10 02:53:55 -07:00
ShizCalev
3abd2b6d27 Cleans up logging 2018-06-09 15:51:58 -04:00
Tad Hardesty
106f5af48b Fix lockboxes not actually being locked 2018-06-08 23:22:12 -07:00
MrDoomBringer
14371cbd3a Gives the toy emag a description showing that it is a toy. (#38341)
* Wa la

* Hahah holy fuck my ONE LINE FLUFF CHANGE doesnt compile

what's an escape character

* i should get FUCKING GITBANNED for this SAD DISPLAY FUUUUUUUUUUUUUUUUCK

NEVER WEBEDIT ON UR PHONE KIDS
2018-06-08 14:18:10 -04:00
81Denton
115ff7f6f1 Runtimestation tweaks (#38340)
* runtimestation tweaks, debug subtypes

* moves exposed wire to maint tunnel
2018-06-08 10:51:00 -07:00
deathride58
c5a0e14acb Tones down values for a lot of different hotspot_expose calls (#38232)
* Tones down values for a lot of different hotspot_expose calls

* Update LINDA_fire.dm (#38217)

* Automatic changelog compile, [ci skip]

* Slight changes to camera network code (#38223)

* Removes a useless var and corrects two cameras to use the automatic naming system to reduce dv usage.

* Damn github didnt notice this was here....

* Fixes datediff not returning (#38215)

* Fixes pocket items being deleted when monkeyizing (#38220)

* Automatic changelog generation for PR #38220 [ci skip]

* readds atmos heating from hotspot_expose(), as requested by naksu

* Tones down hotspot_expose values for sparks moving and destroying

* tones down item heat by a lot. no more burning your face off after smoking a cigarette
2018-06-08 15:53:10 +03:00
fludd12
0d429e01b8 [READY][FINALLY] Various Crossbreed Updates (#38039)
* A Variety Of Updates

* Lovey Sprites!

* Adds implementation for listening status effects.

* Fixes implementation, uses defines instead of magic strings.

* Completely reworks status effect listeners

* Fixes Love Potions

* Fixes Approximately All The Things.jpg
2018-06-08 15:51:03 +03:00
AnturK
8140d95758 High Gravity - First Draft (#38043)
* High Gravity - First Draft

* Replaces has_gravity defines for areas.

* Default gravity ztrait

* Adds some gravity effect and skips damage at gravity = 2

* Paralysis icon

* Antigravity grenades for some abuse

* Makes the damage treshold a define and makes alert description more accurate.

* Bluh
2018-06-08 15:48:07 +03:00
AnturK
569545d213 Fixes pAI emp act. (#38352) 2018-06-08 15:46:37 +03:00
Tad Hardesty
9c97ea7f05 Fix pAI suicide while in holoform deleting the card (#38279) 2018-06-07 21:06:27 -04:00
Jordan Brown
62f20ca4a7 Merge pull request #38288 from Jalleo/Removes_Admin_detect
Removes a defect concerning a simple tool in the admin toolset
2018-06-07 09:51:38 -04:00
MrDoomBringer
424bc0a105 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290)
* Arianya

* whups caps
2018-06-05 16:01:48 -07:00