cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,147 Commits 73 Branches 18 Tags
9efa3f14f238ce9c2186843f9cb1f7f6a087025f
Commit Graph

18917 Commits

Author SHA1 Message Date
DamianX
9efa3f14f2 Fixed holodeck hard dels (#27415) 
* Fixed holodeck hard dels, MURDERED VARIABLE COPYING

* air but differently

* Add return type hint
 2020-08-09 15:21:10 +02:00
DamianX
56d9c747f2 consistent surgery duration (#27368) 2020-08-09 15:19:44 +02:00
DamianX
855116d64c Fixed infrared emitter runtimes (#27401) 2020-08-09 15:19:26 +02:00
DamianX
006cbbe8d5 removed unused events episode 2 attack of the clones (#27271) 2020-08-09 15:19:12 +02:00
adrian
b4a9c52a85 Some small fixes (#27448) 
* Who the fuck overdoses a goliath with honk serum?

* Fixes two bad food spawners

* More descriptive test name

* I lost track of this runtime.

* whatever

* Fixes runtime in spreading_growth.dm,20: bad index. Null is a valid value here
 2020-08-09 14:31:38 +02:00
Viciousaurus
75e34e8e7f Synergy patch #1 (#27438) 
* Pillow bugs have been disciplined

* Fixing bugs

* Some more fix

* nevermind this
 2020-08-08 11:48:37 +02:00
DeityLink
df56640762 Newsreader PDA App (#27344) 
* premiliminary stuff

* NewsReader

* forgot a couple notifs

* FixPaper

* herp derp

* aight we good

* Update code/game/machinery/newscaster.dm

* Update code/game/objects/items/devices/PDA/PDA.dm

Co-authored-by: adrian <artii.ftw@hotmail.com>

* fixes

Co-authored-by: adrian <artii.ftw@hotmail.com>
 2020-08-08 03:30:10 -03:00
ShiftyRail
8b25c338ab Outfit datums, but it works! (#27404) 
* Revert "Revert "Outfit datums update" (#27400)"

This reverts commit c9377ceebd.

* Fixes a mess
 2020-08-07 18:49:41 -03:00
DamianX
e4cb0e114d virtualhearer thing (#27391) 2020-08-07 12:41:55 -03:00
DamianX
28af48a4f7 Optimized infrared emitters (#27403) 2020-08-06 17:26:03 +02:00
adrian
1d54275888 Fixes invalid hunting rifle slowdown (#27402) 
* Fixes invalid hunting rifle slowdown

* I can't read
 2020-08-06 16:51:42 +02:00
DamianX
c9377ceebd Revert "Outfit datums update" (#27400) 2020-08-06 16:03:37 +02:00
jknpj
94434af73b Merge pull request #27340 from ShiftyRail/the_final_merging 
Outfit datums update
 2020-08-06 07:39:43 -03:00
DamianX
e8f5989725 Clone damage is transferred as brute damage upon monkey transformation (#27369) 2020-08-06 07:37:40 -03:00
adrian
171ac14d5c Removes soul swarm (#27386) 2020-08-06 07:36:14 -03:00
DamianX
cccb12ff2e Fixed a bug with mechanic cool necklaces (#27389) 2020-08-06 07:35:25 -03:00
DamianX
036a826299 Added a button admins can press to motivate mechanics to perform their duties (#27361) 
* mechanic motivation collar

* now works as internals

* add logging

* add zlevel check, require 80% charge
 2020-08-05 10:33:58 -03:00
beesil
e48892696f fixes mining rig suit storage (#27374) 2020-08-05 10:32:16 -03:00
adrian
ad24051cb6 Seeds icons unit test. Fixes brown mold spores blank icon. Removes an unused seed type (#27378) 2020-08-05 13:31:43 +02:00
DamianX
13a9b1409a Improved typing indicator (#27365) 
* Improved typing indicator

* imagine compiling your code
 2020-08-04 09:28:25 -03:00
ShiftyRail
dfb13b9340 Merge branch 'Bleeding-Edge' into the_final_merging 2020-08-03 23:29:52 +02:00
Kurfursten
21c4a759c0 Merge pull request #27326 from DamianX/SurgerySpeed 
Faster surgeries: cutting open, clamp bleeders, cauterize
 2020-08-03 06:37:50 -05:00
Kurfursten
d22760636d Merge pull request #27351 from Zth--/foodicons 
Adds food icons unit tests
 2020-08-03 06:33:25 -05:00
Kurfursten
d92256a1f7 food sprites fixed (#27357) 2020-08-03 12:57:16 +02:00
DeityLink
57f662d998 Sepia v2 (#27343) 2020-08-03 00:29:16 -03:00
zth
9610207629 Adds food icons unit tests and a few minor fixes with some warnings or runtimes 2020-08-02 17:56:37 -03:00
DeityLink
9bc85f1215 Some news-related file rearrangements (#27347) 
* goodbye

* hello

* ground work

* why tho
 2020-08-02 22:04:45 +02:00
Shifty/Anthomansland
e94cb0a978 there there 2020-08-02 15:09:29 +02:00
Shifty/Anthomansland
3c9ee208fd Correct test 2020-08-02 15:01:45 +02:00
Shifty/Anthomansland
6889be70cb Final merge 2020-08-02 09:11:35 +02:00
Kurfursten
c80b6a3d3c Merge pull request #27272 from gurfan/photocopierchange 
Toner cost changes.
 2020-08-02 01:59:14 -05:00
JTGSZ
a695dc8740 Removes Kitty Ears Update_icon call from human inventory code (#27328) 
* Removes Cat Ears from Inventory Code

* Update misc_special.dm

* This should fix the last issue with cat ears
 2020-08-02 06:22:31 +02:00
DamianX
63422b0be2 Fixed power_connection runtime (#27321) 2020-08-01 17:24:03 -03:00
ShiftyRail
3b4270a675 Fixes sql errors with rust_g (#27333) 2020-08-01 12:48:40 +02:00
Damian
4eeb87fa8e Faster surgeries: cutting open, clamp bleeders, cauterize 2020-07-31 18:04:18 +02:00
drawsstuff
56c5ce0992 Adds 11 new hair sprites. (#27302) 
* Adds new hair

Adds 11 new hair sprites

* x

Co-authored-by: SonixApache <soniixapache@hotmail.com>
 2020-07-30 09:14:29 -03:00
DamianX
b818348b0e Maybe fix nano/tgui runtime (#27309) 2020-07-29 11:42:07 -03:00
gurfan
ec338a3a83 add a check (#27273) 
Co-authored-by: gurfan <mahimahi6272@gmail.com>
 2020-07-29 15:58:26 +02:00
SonixApache
ad88297da8 old glocks + suppressor overlays + other changes (#27204) 
* old glocks + suppressor overlays + other changes

 + Re-adds old glock sprites
 + Fixes issue where all glocks were fancy glocks
 + Moves sprites from biggun.dmi to gun.dmi
 + Adds suppressors as overlays
 + Tidied up autoglock attachment render code
 + Suppressors already had a description, now they have one instead of two
 + No longer need to hold a gun in hands to attach suppressor
 + Other stuff?

* turns out you can access lists directly

* use same words, suppressor -> silencer

* useless code

* disallow double attaching
 2020-07-28 21:22:23 -03:00
adrian
e5877d3f4b More runtimes (#27289) 
* Fixes a bad spawner on gingerbread house

* Fixes credits songs

* Fixes a runtime with null telepads

* Oops

* Adds a simple autolathe/ammolathe unit test

* Forgot to commit the file
 2020-07-28 08:59:55 +02:00
SnakeEater14
5477b67906 Plainclothes Security Uniform (Part 2, this time without admin fuck ups) (#27224) 
* Plainclothes Security Uniform

This time with no admeme fuck ups.

* Fix to CasualSec Sprites
 2020-07-27 18:37:22 +02:00
gurfan
8840a61963 Cyborgs are now hackable again by Malf AIs (#27176) 
* hackable borgs

* fix defeat triggering after nuke

* remove that for now, fix it later

* temporary

* better descriptions

* still let tator borgs emag themselves

Co-authored-by: jknpj <jknpjr@gmail.com>

* change to bool

Co-authored-by: jknpj <jknpjr@gmail.com>

* Update code/game/machinery/computer/robot.dm

Travis is triggering my autism

Co-authored-by: gurfan <mahimahi6272@gmail.com>
Co-authored-by: jknpj <jknpjr@gmail.com>
 2020-07-27 07:39:13 -03:00
adrian
fa160a5f01 Fixes spacepods runtiming every time they shoot (#27279) 
* Fixes dumbfire runtiming

* Consistency
 2020-07-27 11:56:57 +02:00
boy2mantwicethefam
5bfdd6ae4b canmove (#27246) 2020-07-27 11:53:40 +02:00
TJ
252a05e6be Fixed droppers consistently saying 'You can't do that, the dropper is not open." (#27116) 
* Added an advanced stun baton, which spawns with the HoS.

* Fixed droppers redundantly telling users "You can't, the dropper is closed."

* Refactored dropper attacks slightly.

* Removed changes from another commit.

* I hate git

* Removed merge changes
 2020-07-27 11:52:36 +02:00
hbycyl
cfd7a3e452 Ammolathe recycling (#27190) 
* Changes how recycling is handled, now respects the machine's allowed_materials

* Lets the ammolathe recycle things

* Gives ammo and guns material values for recycling (50% of their build cost)

* oop bloat to appease the robot overlord

* adds typing to material_list

* Revert "oop bloat to appease the robot overlord"

This reverts commit a4c0409999.

Co-authored-by: tianyou <fuckgit@fuckgit.fuck>
 2020-07-27 06:49:45 +02:00
toomykins
b8b7315061 [tweak] removes choking fetish (#27275) 2020-07-27 06:40:08 +02:00
bthomas2
24ff263361 fixed ESL (#27282) 2020-07-27 06:38:02 +02:00
adrian
8d7736ec16 Fixes wizard sneks runtiming when they die (#27281) 2020-07-26 17:54:26 -03:00
gurfan
7300656965 lower it 2020-07-26 01:05:25 -05:00