Commit Graph

173 Commits

Author SHA1 Message Date
boodaliboo
def79dbb0b ports researching boosting nanites (#9451)
* Update utility.dm

* Update nanite_designs.dm

* Update all_nodes.dm

* Update nanites.dm
2020-08-15 14:30:34 +01:00
Hopekz
e03d7eb253 Forensic scanner system rework/revamp (#8810)
* Animates the detective scanner while scanning

* Woop

* Scanner sounds

* Scan feedback revamp

* Sound checks

* more sound checks

* Animation now plays during printing

* Start of procs. Getting ready for radials

Now just need to create sprites and actually build the context sensitive radials

* Admin forensic scanner

* Advanced scanner exists; sprite + animation + framework

* location of scan for advanced

* whoop

* Admin scanner feedback

* admin result ping

* Advanced scanner update

* Advanced scanner animation sync + GPS info

* Radial menu's for interaction

* print speed + added to Protolathe

* Tech tree addition

* Alt_click returns

* Removes debug comments

* Fixing spaces before Jamie gets here

* Badmin scanner has a 50% chance to have an aqua colored advanced sprite

* Merge conflict be gone

* Update code/modules/detectivework/scanner.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* 2 sleep's in to 1

* Alex doesn't like procs ):

* Alex doesn't like being able to edit sounds with VV

* Moved icon_state_neutral to initial

* Revert "Moved icon_state_neutral to initial"

This reverts commit 92691420a7.

* Another icon conflict because people are retarded

* Removed dynamic sound code

* whoop

* Update code/modules/detectivework/scanner.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/modules/detectivework/scanner.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/modules/detectivework/scanner.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/modules/detectivework/scanner.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/modules/detectivework/scanner.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/modules/detectivework/scanner.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/modules/detectivework/scanner.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/modules/detectivework/scanner.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Does the initial thingy

* Lmao Nich

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-07-16 14:31:50 -04:00
T-H
1a95ce3a92 Mixing bowls for chef (#9148)
* mixing bowls

* Adds mixing bowl to kitchens

* Ways to make service items, and more mixing bowls on maps

* heck

* be

* gone

* conflict

* what

* help

* why

* Update drinnerware.dm

* Update protolathe.dm

Co-authored-by: wejengin2 <patpol4@protonmail.com>
Co-authored-by: wejengin2 <48154165+wejengin2@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2020-07-08 15:42:03 +01:00
jcatjmeow
7b9ffcb1df Ports body cams from prebase! (#8819)
* Bodcam

* E

* Finishes it

* smh jamie

* Adds it to the spare mining lockers for latejoiners

* Update mine_items.dm

* Adds the cam to the conscription kit too

* Apply suggestions from code review

Co-authored-by: Jamie D <digweed.jamie@gmail.com>

* Update _neck.dm

* Update mine_items.dm

* nerfs! EMP and strip!

* more nerfs - weight class

* Update _neck.dm

* Update _neck.dm

* Update code/modules/clothing/neck/_neck.dm

Co-authored-by: Jamie D <digweed.jamie@gmail.com>

* _

* DONE

* Update _neck.dm

* _

* Update _neck.dm

* Update neck.dmi

* Apply suggestions from code review

Co-authored-by: Jamie D <digweed.jamie@gmail.com>

* Apply suggestions from code review

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* QDEL_NULL(bodcam)

* Update _neck.dm

* Update _neck.dm

* inputs: sanitized

* Im a good coder I swear

* Update bodycamera.dm

* Spacing fuck you jamie

* Update bodycamera.dm

* I really fucking hope this works

* removes a debug message

* Adds a message to let people know when an item has NO_STORAGE

* Darkstick suggestion

* Apply suggestions from code review

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>

* Update bodycamera.dm

* update_static_data now passes user to push_data() (#51485)

update_static_data now passes user to push_data().

I'm pretty sure no UIs currently use user in ui_static_data for... Anything. So that's why no one noticed this before. Well, better to pass it than not.

* w

* Update doppler_array.dm

* Revert "Update doppler_array.dm"

This reverts commit 4aba56aab6.

* Revert "w"

This reverts commit 1a1783faaa.

* tgui

* Update yogstation.dme

* Update AirlockElectronics.js

* Update tgui.bundle.js

* fix

* Update camera.dm

* Camera Fixes

* Update skin.dmf

* Update camera.dm

* Update camera.dm

* Update camera.dm

* fef

* Reminder to self: uncomment this stuff when gamer's dumb pr is merged

* Gamer's dumb tgui pr now works with mine :P

* Update bodycamera.dm

* Sprites for worn item, and fire resist for the miner one

* Update bodycamera.dm

* name change

* Update bodycamera.dm

Co-authored-by: Jamie D <digweed.jamie@gmail.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Co-authored-by: Trigg <36010999+TriggeredBoi@users.noreply.github.com>
Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-06-29 20:28:46 +01:00
jcatjmeow
2e71e4e73f Redoes KMC's ticket machine and allows it to be built. (#8833)
* Re-does the ticket machine, and makes it obtainable in game

* Update ticketmachine.dm

* Update ticketmachine.dm

* Update ticketmachine.dm

* more ticket stuff

* Update ticketmachine.dm

* shifts a sprite over by 1 pixel

* Update yogstation.dme

* Update ticketmachine.dm

* Update EclipseStation.dmm

* Update ticketmachine.dm

* Apply suggestions from code review

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>

* Update ticketmachine.dm

* Update code/modules/research/designs/misc_designs.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>

* Update ticketmachine.dm

* Update ticketmachine.dm

* Tickets ding you

* Update EclipseStation.dmm

* Update EclipseStation.dmm

* Adds it back to eclipse, plus fixes a runtime

* Revert "Adds it back to eclipse, plus fixes a runtime"

This reverts commit 9483c1bb4c.

* Revert "Update EclipseStation.dmm"

This reverts commit 12b1bea5c3.

* Revert "Update EclipseStation.dmm"

This reverts commit 70fe97e841.

* EEEEEE

* Update EclipseStation.dmm

* Apply suggestions from code review

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>

* Destroying a ticket machine gets rid of all the tickets printed by it

* Update bureaucracy.dmi

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2020-06-22 23:25:05 +01:00
Jamie D
071cea3d7b Corporate Go Brrrr (#8942)
* Yeet

* fkin eclipse
2020-06-18 13:41:29 -04:00
ynot01
74fbd567d0 Adds "Transitum" x-ray laser mech weapon (#8741)
* xraybeam

* Update weapons.dm

* node and exofab

* Update weapons.dm
2020-06-02 18:29:52 -04:00
Jumps
cca6387499 ports Researchable Smartmines + Exploding Rubber Duck traitor item from Beestation (#8437)
* initial

* removes soundsynth

might add this back later i'm not too sure about it atm

* reduces disarm time

* bro pls

* Revert "bro pls"

This reverts commit a0a319dd0e.

* changes for alexkar

* changes2

* turdis why

* spacing

* desc change

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2020-05-29 15:15:23 -04:00
MenacingManatee
73177ef248 Adds cowboy lawset to rnd (#8724) 2020-05-28 16:47:48 -05:00
Katie
a18168cfc9 adds ceo to techweb (#8511) 2020-05-17 04:04:09 -04:00
jcatjmeow
7f5c6ba218 Adds a new Alternative to the Corporate Lawset (#8398)
* Revert "Revert "Rewrites the Corporate Lawset (#8394)" (#8396)"

This reverts commit 18ca7f9f69.

* Brings the pr in compliance with council

* spelling

* Adds the board

* Adds the board to the lathe

* Update lootdrop.dm

* Update code/datums/ai_laws.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/game/objects/effects/spawners/lootdrop.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/game/objects/items/AI_modules.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/modules/research/designs/AI_module_designs.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Adds the lawset to the techweb

* Trimmed the lawset

Co-authored-by: Hopekz <hopekxx@gmail.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2020-05-13 22:31:22 -04:00
alexkar598
b2c2475d56 Crewsimov lawset (#8487)
Co-authored-by: alexkar598 <>
2020-05-12 15:45:42 -04:00
Jamie D
c9e86284db Adds plasma cutter to Miner Cyborg 2020-04-12 17:22:01 +01:00
Theos
005d9d61ec DNA recovery moved from advanced to experimental 2020-04-04 03:13:26 -04:00
Ktlwjec1
aa5e08912b remove vr_sleeper from biotech 2020-02-18 05:09:46 +00:00
Theos
d9b152b80a Update all_nodes.dm 2020-01-15 00:03:41 -05:00
alexkar598
5e1a445612 Update all_nodes.dm 2020-01-12 17:54:56 -05:00
Katie
9a3ec9b7df Adds meson health scanner HUDs (#7451)
* adds meson health hud

* changed this by accident

* remove hud scanner from mm locker
2020-01-01 09:34:54 -05:00
Nickvr628
bddbfeecdf New Security Tools: Rainbow 6 Edition: Unfucked Edition (#7396)
* Adds all the necessary code for breaching rounds

* Adds breaching slug boxes to maps

* Adds Breaching Tool to code and maps

* new slug design (blunt nose)

credit to Identification

* no more poop shells

* Update YogsDelta.dmm

* Update code/game/objects/items/storage/boxes.dm

Co-Authored-By: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/modules/projectiles/ammunition/ballistic/shotgun.dm

Co-Authored-By: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/modules/projectiles/guns/ballistic/shotgun.dm

Co-Authored-By: Nichlas Pihl <nichlas00100@gmail.com>

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2019-12-29 15:55:38 +01:00
Nichlas Pihl
f4a02d42f1 Merge pull request #7156 from Codeatmos/AUTOLATHETIM
fuck it,blitz sec
2019-12-01 21:20:50 +00:00
Codeatmos
8ab6f74b83 200 thousand doll 2019-11-25 16:29:48 -06:00
Ktlwjec
b9ff18463c removed duplicates 2019-11-18 10:07:20 +00:00
Codeatmos
a1226c9c76 Race Sensor Nanites from tg (#6950)
* rasicm

* uh oh stinky haha funny poop funny

* hello mr.yogstatioN
2019-11-02 08:03:15 -04:00
Calvin Hobbes
9bc9b17803 Fixes my late night shit code and improves lungs 2019-10-23 18:12:28 -04:00
Nichlas Pihl
e9b8a0e6b8 Merge pull request #6740 from Darkstick/DNA_fixing
DNA fixing surgery
2019-10-04 10:20:14 +01:00
Nichlas Pihl
0e33c9a90b Merge pull request #6764 from AsV9/hgbvnj
You can no longer print AI or Cyborg upload boards in the Science R&D lathe
2019-10-04 10:07:04 +01:00
Nichlas Pihl
8ba125c8f1 Merge pull request #6787 from SomeguyManperson/fuck_borgs
Removes VTEC from the research tree
2019-10-04 10:05:34 +01:00
Theos
08570628e4 deletes military grade borg node 2019-10-02 15:55:21 -04:00
AsV9
c70319eabc Cyborg uploads too 2019-09-27 23:41:08 +02:00
AsV9
9e9cf02623 AI upload board can no longer be printed in Science. 2019-09-27 23:19:56 +02:00
AsV9
21617ed4e5 Removes xenobiology console from spawning at round start, must now be constructed 2019-09-25 13:38:57 +02:00
Darkstick
766202de24 adds the surgery to research table
title
2019-09-20 21:52:04 -04:00
Theos
8e75b79f15 Update all_nodes.dm (#6432) 2019-07-24 20:55:34 -04:00
Nichlas Pihl
3a0e1a9178 Update all_nodes.dm 2019-07-23 02:39:41 +02:00
Nichlas Pihl
fb56c9ce81 Update all_nodes.dm 2019-07-21 19:47:21 +02:00
Nichlas Pihl
a394ae72be Merge branch 'master' into upstream-merge-44819 2019-07-20 16:56:15 +02:00
Ling
dde1e6c435 Merge pull request #6090 from AdamElTablawy/patch-18
some retard argued with me over something so now i am punishing the entire server by nerfing mechs
2019-07-14 15:25:39 +02:00
Nichlas Pihl
2710fc9102 Merge pull request #6207 from yacabo/leon-trotsky-did-nothing-wrong
Adds Tricorders
2019-07-12 11:46:35 +02:00
Nichlas Pihl
ddd8415231 Update all_nodes.dm 2019-07-06 02:40:26 +02:00
yacabo
8c016ade18 Adds Tricorders
Adds tricorders to the game which can be researched in experimental engineering

The tricorder is a late shift scanner which is basically a bunch of scanners meshed into one being:
*Gas analyzer's turf and pipe gas scanning
*Multitool's wire pulsing and grid power usage checking
*Slime scanning
*An extremely gutted medical scanner that can only estimate, though this can be turned into a regular scanner with a built in var

All of it being context sensitive so there's no need to switch modes
2019-07-03 00:22:30 -04:00
yogstation13-bot
dc6d508993 Dissection/Revival Surgery made more easily accessible 2019-06-29 00:46:36 +01:00
AdamElTablawy
f03a036e27 arrrrrrrrrrrrrrrrrrr 2019-06-25 21:20:17 -07:00
yogstation13-bot
769aaac857 Moves the bag of holding up one tech tier 2019-06-24 23:13:21 +01:00
Theos
e5b24f42a0 Update all_nodes.dm 2019-06-19 19:25:08 -04:00
Theos
63e017914b Update all_nodes.dm 2019-06-19 19:24:13 -04:00
Theos
bea76313e4 Update all_nodes.dm 2019-06-19 19:23:13 -04:00
Theos
52e3820f19 Update all_nodes.dm 2019-06-19 19:20:52 -04:00
Theos
b6c9c86958 whoops 2019-06-19 19:14:23 -04:00
Theos
9809360a4b Update all_nodes.dm 2019-06-19 19:12:25 -04:00
Theos
5bafcac97c Merge branch 'master' into upstream-merge-44088 2019-06-19 19:07:51 -04:00