Commit Graph

7138 Commits

Author SHA1 Message Date
Dennok
4f64081276 deconstructable-TEG (#38656)
Make TEG deconstructable.
2018-07-01 00:59:34 +03:00
ShizCalev
7d737259e0 Fixes PDA ID teleporting (#38795) 2018-06-30 12:09:29 -07:00
ShizCalev
4cc1c5214e Cleans up leftover telesci teleporter code (#38789) 2018-06-30 01:54:20 -07:00
Jordan Brown
26b6fab1fe Merge branch 'pr-38604'
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2018-06-28 14:22:03 -04:00
Jordan Brown
fc948d41eb Merge branch 'pr-38698'
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2018-06-28 14:22:02 -04:00
Jordan Brown
ccfb1d2365 Merge branch 'pr-38757'
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2018-06-28 14:21:57 -04:00
Jordan Brown
2ecd5c6809 Merge branch 'pr-38765'
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2018-06-28 14:21:56 -04:00
ShizCalev
964b748919 Fixes ID console exploit (#38768) 2018-06-28 21:17:39 +03:00
Anonmare
68edd12174 It just occured to me the line is unnecessary 2018-06-28 00:33:43 +01:00
Anonmare
ae8c799cd8 Dulls the possessed Chainsaw's blade 2018-06-27 18:41:50 +01:00
AnturK
57028bfa4b Adds missing TIMER_UNIQUE to TIMER_OVERRIDE 2018-06-27 12:54:02 +02:00
oranges
6827d79a6b Merge pull request #38673 from ninjanomnom/kevin-cleanup-crew
Some uplink component GetComponent cleanup
2018-06-27 20:54:33 +12:00
Nich
40e071e71e Revert "Makes the TEG deconstructable" (#38616)
* Revert "Makes the TEG deconstructable (#38056)"

This reverts commit 67ff23a9a1.

* Revert "Automatic changelog generation for PR #38056 [ci skip]"

This reverts commit 36d5170868.
2018-06-27 20:49:31 +12:00
Dax Dupont
278f4d7429 anal 2018-06-26 23:46:15 +02:00
ShizCalev
89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
Jordan Brown
ba28c1f920 Merge pull request #38644 from AutomaticFrenzy/patch/cameranet
Port AI static to vis_contents
2018-06-25 21:22:58 -04:00
cinder1992
9e5769be7b Added Officer's Sabre suicide (#38662)
* Added Officer's Sabre sucide

* Oopsie

* Brute for the Brute God!

* pick_n_take is a thing

* Cleanup

* Cleanup 2: Electric Boogaloo

* Sabre suicide covers all arms and legs

* Suicides now take the same ammount of time for users with more than two arms and two legs
2018-06-24 10:44:27 -04:00
Dax Dupont
63b0e46a63 Wat zullen we drinken Zeven dagen lang Wat zullen we drinken, wat een dorst Wat zullen we drinken Zeven dagen lang Wat zullen we drinken, wat een dorst Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Dan zullen we werken Zeven dagen lang Dan zullen we werken, voor elkaar Dan zullen we werken Zeven dagen lang Ja zullen we werken, voor elkaar Dan is er werk voor iedereen Dus werken we samen Zeven dagen lang Ja werken we samen, niet alleen Dan is er werk voor iedereen Dus werken we samen Zeven dagen lang Ja werken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Eerst moeten we vechten Niemand weet hoe lang Eerst moeten we vechten, voor ons belang Eerst moeten we vechten Niemand weet hoe lang Eerst moeten we vechten, voor ons belang Voor het geluk van iedereen Dus vechten we samen Samen staan we sterk Ja vechten we samen, niet alleen Voor het geluk van iedereen Dus vechten we samen Samen staan we sterk Ja vechten we samen, niet alleen 2018-06-24 14:45:07 +02:00
ninjanomnom
bbb4147aa2 Some uplink component GetComponent cleanup 2018-06-23 01:41:34 -04:00
Jordan Brown
6a603b733d Ports more things to Initialize (#38653) 2018-06-22 16:56:09 -07:00
Tlaltecuhtli
24b21b8416 [READY] better contraband crates (#38321)
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
2018-06-22 11:51:29 +12:00
kevinz000
961fbfc99a Fixes and adds blast cannons to traitor science uplink items (#38093)
rscadd: Blast cannons have been fixed and are now available for purchase by traitorous scientists for a low low price of 14TC.
rscadd: Blast cannons take the explosive power of a TTV bomb and ejects a linear projectile that will apply what the bomb would do to a certain tile at that distance to that tile. However, this will not cause breaches, or gib mobs, unless the gods (admins) so will it.
experimental: Blast cannons do not respect maxcap. (Unless the admins so will it.)
2018-06-22 11:38:29 +12:00
YPOQ
d4136f4a65 Fixes gulag stacker not giving points after RPG loot event (#38570)
* Fixes gulag stacker not giving points after RPG loot event

* Moves point values to type vars

* cleanup
2018-06-21 17:30:13 -04:00
Tad Hardesty
b754e47b09 Tidy up cameranet code slightly 2018-06-20 21:58:58 -07:00
ShizCalev
f338f09207 Cleanup & corrections 2018-06-20 21:57:17 -04:00
Jordan Brown
cb0f3a8a6f Merge pull request #38609 from AnturK/missedthatinreviewwhoops
Fixes chemnade logging and cleans up the reagent stringify helper
2018-06-20 10:26:18 -04:00
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
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -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
AnturK
4dcfded622 Some spacing for readability 2018-06-19 20:02:35 +02:00
AnturK
3c972c41ee Fixes chemnade logging and cleans up the reagent stringify helper 2018-06-19 19:39:30 +02: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
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
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
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
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
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