Commit Graph

7162 Commits

Author SHA1 Message Date
Jordan Brown d0184129b2 Merge pull request #38982 from 81Denton/shuttle-loans
Adds a new shuttle loan event, tweaks others
2018-07-12 12:01:51 -04:00
81Denton 044279e845 Adds missing merge_type to mineral sheets (#39054) 2018-07-11 13:15:30 +03:00
Jordan Brown 2a3165e9c7 Merge pull request #39020 from vuonojenmustaturska/commandersword
Makes the ERT commander's sword great again
2018-07-10 13:57:05 -04:00
vuonojenmustaturska d249f9feb1 henk 2018-07-09 23:02:59 +03:00
vuonojenmustaturska d5bb2c58b1 make possessed chainsword great again 2018-07-09 22:01:28 +03:00
Jordan Brown 96c92d5eb7 Merge pull request #38938 from ninjanomnom/b-b-bump
Converts collide back to bump and fixes double bumping in another way
2018-07-09 14:50:27 -04:00
oranges 0d5001cea9 Merge pull request #38978 from TerraGS/multitool_soundfix
Makes hits from multitools sound as painful as they are.
2018-07-10 00:50:53 +12:00
81Denton d54d841f18 Fixes smuggler's satchel typo (#38967) 2018-07-08 18:58:42 -04:00
Denton 6bb8eb514d just bee urself 2018-07-08 09:33:13 +02:00
Cruix 275aa2bfa2 AI detection multitools can show camera static and AI eyes (#38255)
The old color-change functionality of the multitool remains unchanged. The hud is toggled with an action button, because multitools already have an attack_self() that does something. When toggled on, you get the hud as long as the multitool is in any slot on your body.

The only way I could find to reliably show exactly where an AI is looking was to place an image on every turf they are looking at. Because AI eyes move around a lot and I do not want them placing images all over the place when they do not have to, if there is nobody in the world currently using an ai detection multitool, they will not update the images until someone is.

Only AI eyes and multicamera zones currently appear. Advanced camera consoles do not appear on the hud, and no longer trigger the proximity color change. Also fixed multitools not appearing in-hands if their icon state changed.
2018-07-08 17:19:55 +12:00
Qustinnus 284f90a3ab Makes some requested changes to mood (#38851)
cl Floyd
del: removed beauty / dirtyness
balance: Mood no longer gives you hallucinations, instead makes you go into crit sooner
/cl

oranges requested these changes, i havn't coded in DM for a while so I might have made some mistakes
2018-07-08 13:50:54 +12:00
TerraGS b04ad93a48 Makes hits from multitools sound as painful as they are. 2018-07-07 19:39:57 -05:00
ninjanomnom 059da44453 Converts collide back to bump and fixes double bumping in another way
This is in preparation for step_x support as the default behavior for these procs is necessary for proper functionality.

turf/Enter and atom/movable/Move default code got rewritten to replicate default byond functionality with minor changes.
2018-07-07 11:22:29 -04:00
Trevor Serpas bee0b5b2c3 Afterattack() Signal (#38606)
* adds signal and modifies each call of afterattack to call it's inherited proc

* uses new macro for sendsignal()

* map fuck

* skip precommithooks

* combine and negate 2 ifs
2018-07-07 02:00:25 -04:00
Jordan Brown 9882ca5d51 Merge pull request #38888 from AnturK/ilovethisparser
Clears stuff detected by SM's parser.
2018-07-04 10:09:50 -04:00
Jordan Brown 041cd94994 Merge branch 'pr-38868'
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2018-07-03 13:54:27 -04:00
zxaber 58e1e75921 Allows empty borg shells to be disassembled. (#38639)
* Adds the ability to deconstruct empty cyborg shells.

* Update robot_parts.dm

* Able to directly swap cells

Added ability to change out power cells with a screwdriver.

* Update robot_parts.dm

* Removing unnecessary `src` prefixes from code.

* Update robot_parts.dm

* Moved to wrench_act and screwdriver_act overrides

I think I did this right

* Replaced screwdriver code

* Swapping out qdeleted for an if-not

* Adds a check for cell-less shells when MMI is added.

* Update robot_parts.dm

* Adds the ability to just remove the cell

Re-organized the screwdriver section as well, and added the ability to add a cell to a shell with no cell.

* Whoops

Copypaste error

* Changed the screwdriver section from nested if statements to use a function

Also removed the line that forced the naked endoskeleton out of your hand in the wrench section.
2018-07-03 13:15:35 -04:00
AnturK d71b205133 Clears stuff detected by SM's parser. 2018-07-03 12:32:06 +02:00
oranges bdada64657 Merge pull request #38835 from AutomaticFrenzy/patch/watertank
Fix backpack water tank behavior, related fixes
2018-07-03 12:52:40 +12:00
AnturK 9875f19053 Should look before simplyfing names 2018-07-02 14:32:05 +02:00
AnturK 8710320ff2 Fixes blueprint overlays. 2018-07-02 14:12:42 +02:00
Jordan Brown e34100dc54 Merge pull request #38832 from AutomaticFrenzy/patch/light-tile
Fix light tile creation
2018-07-02 06:26:11 -04:00
Dennok 4f64081276 deconstructable-TEG (#38656)
Make TEG deconstructable.
2018-07-01 00:59:34 +03:00
Tad Hardesty 6e72c777bf Fix backpack water tank behavior, related fixes 2018-06-30 14:49:13 -07:00
Tad Hardesty 211978cbb2 Fix light tile creation 2018-06-30 12:33:49 -07: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