coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
70,455 Commits 9 Branches 11 Tags
d46512d63cbf413a26b7dd928823dbc5d6c1956c
Commit Graph

50778 Commits

Author SHA1 Message Date
skoglol d46512d63c RCD silo link message fix (#49844) 
* RCD silo link message fix

* RCD silo log fix

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

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

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

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

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

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
 2020-03-14 02:05:15 +01:00
Dennok 752c0bdac3 Parallax fix (#49850) 2020-03-14 02:03:40 +01:00
nightred 542dd659a4 Fix bodytemp damage calculation (#49920) 2020-03-14 02:00:24 +01:00
LemonInTheDark 430d9f5cb9 Makes borg and mining drone's mesons not full-bright. (#49919) 
Moves the background darkness from human.dm to hud.dm
 2020-03-14 01:59:53 +01:00
wesoda25 a34e81d426 Adds a couple mood events (#49918) 
* bang!

* Dr. Joseph-Ignace *********
 2020-03-14 01:58:18 +01:00
Fikou c532536301 fixes typo (#49916) 2020-03-14 01:57:05 +01:00
moo 840517ff0e im sectsy (#49874) 2020-03-14 01:54:41 +01:00
Iamgoofball ff858ea504 Adds the 40 player minimum to Families, my bad. (#49889) 
Totally forgot to re-add this.
 2020-03-14 01:16:01 +01:00
Dennok c65d08dd7f radial repeat close (#49871) 
* radial repeat close

use radial again to close radial menu

* up
 2020-03-13 21:16:55 +01:00
tralezab 46b1214d98 ai zMove > eyeobj zMove (#49730) 2020-03-13 15:24:03 -04:00
skoglol a032d7ef40 Merge pull request #49847 from Mickyan/wig_mimicry 
Allows wigs to copy hair styles
 2020-03-13 18:27:11 +01:00
skoglol 1a916e6d86 Merge pull request #49908 from TetraK1/shuttleinfo 
Improve shuttle calling checking order
 2020-03-13 18:25:23 +01:00
skoglol 554301a22a Merge pull request #49906 from ShizCalev/ied-fix 
Fixes spawned IEDs not having cans
 2020-03-13 18:03:38 +01:00
skoglol 88ab76ab30 Merge pull request #49905 from ShizCalev/beatcop-fix 
Fixes undercover cop sunglasses not having flash protection
 2020-03-13 18:02:10 +01:00
skoglol 720a7f3cf3 Merge pull request #49861 from RaveRadbury/Prisoner-Dynamic-Exemption 
Adds Prisoner to dynamic's protected roles list
 2020-03-13 06:08:07 +01:00
spookydonut 4ca8f8086c Remove ui deadcode (curse you) (#49864) 
Aha cheers!~
 2020-03-13 07:07:01 +02:00
skoglol b94cf14b8a Merge pull request #49235 from Bawhoppen/prisoners 
Redesigns and Expands Permabrig
 2020-03-13 05:08:24 +01:00
Bawhoppen ff427395bf final map fixes 2020-03-12 22:28:25 -05:00
Dennok 51f245fa1e ladder radial red arrow (#49872) 2020-03-12 15:32:33 -04:00
RaveRadbury 566a3e9918 let's try this again (#49886) 2020-03-12 14:38:47 -04:00
Iamgoofball 6284eecded Adjust some Families objectives based on feedback. (#49882) 
* Adjust some Families objectives based on feedback.

* Update gang.dm

* Update gang.dm
 2020-03-12 13:47:31 -04:00
cacogen c8c0685288 Replaces parent wand with wand of nothing on Donut (#49887) 
* Replaces parent wand with wand of nothing on Donut

- Renames parent wand 'wand' to distinguish it from wand of nothing
- Simplifies parent wand's description to focus on the fact you shouldn't have it
- Makes parent wand delete itself when fired
- Renames parent magic projectile bolt to differentiate it from bolt of nothing

* prototype wand deletes itself on spawn

* removes snowflakey qdel of the base wand on spawn
 2020-03-12 13:35:47 -04:00
TetraK1 b3abcaac9d Improve shuttle calling dialog order 2020-03-12 12:36:38 +00:00
Bawhoppen 7f73fd2a7b Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
 2020-03-12 05:06:09 -05:00
Bawhoppen 88c1f1812f serving dish + cafeteria tray 2020-03-12 04:47:28 -05:00
ShizCalev 19034e3d77 randomize the cans 2020-03-12 02:48:14 -04:00
ShizCalev 7ddc9511f2 Fixes spawned IEDs not having cans 2020-03-12 02:35:38 -04:00
ShizCalev ef6796c4d4 Fixes undercover cop sunglasses not having flash protection 2020-03-12 02:23:16 -04:00
spookydonut 6a9d4c926f Fix dmdoc generation and revert to SpacemanDMM 1.3 (#49858) 
* f

* disable building from source
 2020-03-11 20:28:43 -04:00
Kyle Spier-Swenson 7a218d05c2 Fixes the mc giving priority to ticker subsystems (#49893) 
The malformed logic here kept the mc from running all ticker subsystems first, (a functionality that i'm not even sure we need to preserve, as long as we update the docs, thoughts?)
 2020-03-12 09:31:08 +13:00
Victor Pellen 8906df5a86 Fixes empty tape recorders getting stuck on pocket and belt slots (#49865) 
* Fixes tape recorders getting stuck on pocket and belt slots

* Inverted the branch into a fallthrough
 2020-03-11 15:26:39 -04:00
Tlaltecuhtli 404a26c74d aloe medical plant addition (#49444) 
* 1

* 2

* removal of id and names

* Update code/modules/reagents/chemistry/reagents/drink_reagents.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/drink_reagents.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/game/objects/items/stacks/medical.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/game/objects/items/stacks/medical.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* lowers price for med suture

* one aloe microwaved to 2 paste

* changes grind

* 🍆

* Update lavaland_surface_ash_walker1.dmm

* merg conflic

* ????????????

* Apply suggestions from code review

* reset travis

* reverts travis reset commit

cringe cringe cringe

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
 2020-03-11 11:54:41 -04:00
RaveRadbury 646cd22022 Hug Fix (#49860) 
* flip flops the negative modifier

This is because when temp_diff is less then 0 it is a negative number.

* modifies the code as requested

* Halves the heat transferred to actually balance out body heat.
 2020-03-11 11:33:06 -04:00
Fikou da0da14276 lowers advanced rcd upgrade price (#49862) 2020-03-11 11:11:58 -04:00
SteelSlayer d4005b2170 Label component code fixes (#49855) 
* Label component additions that should have been included

updates comments

forget this

* fix spelling mistake

* I suck at spelling

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
 2020-03-11 15:30:17 +08:00
ShizCalev c13bfd34f0 Merge pull request #49866 from Ghommie/patch-1 
Webedit touching the MOVESPEED_ID_DAMAGE_SLOWDOWN_FLYING speed modifier.
 2020-03-11 02:36:22 -04:00
Dennok 687ef08c09 Update code/game/objects/items/RCD.dm 
Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>
 2020-03-11 08:20:59 +02:00
Dennok cf9e5e2cb1 Update code/game/objects/items/RCD.dm 
Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>
 2020-03-11 08:20:41 +02:00
Dennok e22dd9ae1e Update code/game/objects/items/RCD.dm 
Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>
 2020-03-11 08:20:16 +02:00
tralezab 70af311909 ahaha (#49857) 2020-03-11 12:46:53 +08:00
RaveRadbury b408735b0f Prevents prisoners from rolling mid-round traitor 
Also removes Prisoners from Wizard rolling restriction.
 2020-03-10 21:05:42 -07:00
RaveRadbury 619e8dc2f9 Adds prisoner to protected and restricted roles list for Dynamic 2020-03-10 20:06:53 -07:00
LemonInTheDark 0007cb1381 Fixes SR not working when the holder is empty (#49779) 
We do this by moving it's callback from the reagent itself to the mob. The callback proc has also changed,
I've added the behavior to revive(), based on the preseance of excess_healing in the arguments.
This is a little snowflakey but the behavior is consistent.
 2020-03-10 20:30:44 -04:00
Unit2E 2a239de7cf fixes toy dualsabers gaining damage (#49789) 
* clean fix for toy problem

* did code suggestions
 2020-03-10 17:16:10 -04:00
Kyle Spier-Swenson 83398600c2 Fixes bugs in the mc related to combos of SS_BACKGROUND and other flags (#49848) 
SS_BACKGROUND Conflicts with SS_TICKER and SS_NO_TICK_CHECK's behavior in certain ways. This fixes that breaking the mc.

SS_BACKGROUND has its own priority bracket that assumes that all remaining subsystems to run are also SS_BACKGROUND, allowing one of these to run when running SS_TICKER subsystems would cause the MC to assume all subsystems that run after it that tick were background subsystems, breaking the math of how much time to allocate the subsystem.

When delaying a run of a SS_NO_TICK_CHECK subsystem for lack of time, the MC will modify it's priority so it runs sooner next tick, if this happened on a background SS_NO_TICK_CHECK subsystem, it would update the wrong running total and desync the running total of the priority of all queued subsystem from the actual sum of those subsystem's priority.
 2020-03-11 09:38:23 +13:00
Bobbahbrown 8ba15b5ea8 [s] Fixes XSS Exploit Defeating Sanitization of Any String in Goonchat (#49867) 
* fix

* cleanup

* renamed that one function

* fixes for users who do not have 5 entries
 2020-03-11 09:29:37 +13:00
Ghom e6ad3e3fc4 Update human.dm 2020-03-10 14:27:23 +01:00
Timberpoes f5cb1d471b Fixes the handheld arcade game not working as intended (#49823) 
* Fixes the handheld arcade game not working as intended

* Removed misleading parameter from ui_act

* Further fixes in light of build errors
 2020-03-10 18:39:02 +08:00
Fikou 367f85440c pirate captain (#49837) 2020-03-10 18:36:43 +08:00
Fikou cb923d982d plastic is now a rigid material (#49838) 2020-03-10 18:35:44 +08:00