coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
69,491 Commits 9 Branches 11 Tags
7cbcd2ff3ca6fcd141b917897ea88dbf8a3b8243
Commit Graph

30335 Commits

Author SHA1 Message Date
Tlaltecuhtli 7cbcd2ff3c adds medipen refiller machine (#49172) 
* 1

* Update machine_designs.dm

* 2

* clean up

* more clean up

*  🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆

* Update code/game/machinery/medipen_refiller.dm

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
 2020-02-12 18:48:19 -05:00
itseasytosee ab889deb14 Hermert (#49289) 2020-02-12 15:13:15 -05:00
ike709 3c0902ac98 Fixes multi-z photography (#49287) 
* Fixes multi-z photography

* Update code/modules/photography/camera/camera.dm

Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>

* Removes unnecessary var

* Close those parentheses

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
 2020-02-12 09:31:16 -05:00
cacogen dd7b061488 Unanchored solar assemblies go off-centre to indicate they need securing. Anchored ones centre themselves (#49303) 
* Random pixel offset for unanchored solar assemblies

Set to 0 when anchored

* better var names
 2020-02-12 09:29:46 -05:00
MMMiracles 3a3e4db192 MultiZ Deck Relay Tweaks (#49053) 
* relays now properly update powernet when being disconnected/destroyed, doesn't use processing anymore

* parents

* no break thx
 2020-02-12 13:08:18 +01:00
Dingo-Dongler 6ea23349c1 Add citation functionality to the SecHud (#49017) 
* PUT THE CAN IN THE TRASH

* max fine now a config opiton

* more proper hud check

* mention maxfine at citation, moving return correctly?
 2020-02-11 20:25:35 -05:00
Qustinnus d646e37bae Bepis design: Table with wheels part 2: electric boogaloo (#49010) 
* WHEELS

* design

* epic

* rolling table fixes

* test

* dumb

* 1`

* fix
 2020-02-11 20:15:05 -05:00
nightred 5d361d9665 [READY] Warm hugs for everyone (#48920) 
* Warm hugs for everyone

* To hot to hug time to cool down

* Warm hug mood, and notice on hot hugs

* fixed mood, added insulation proc

* Balance heat exchange, notify when freezing also

* tenses again

* words, and proc clean up

* Common interfaces

* fixed monkey override

* lets not have another hard suit situation

* really wide lines

* need to invert that number
 2020-02-11 20:03:56 -05:00
Jordan Brown 10563d09ec Merge pull request #49272 from Buggy123/patch-110 
Nuke Ops reinforcements now work on-station
 2020-02-11 13:35:44 -05:00
skoglol 7abce6bfbe Multiline initial adminhelp (#49276) 
* Multiline ahelps

* utf-8 compliant
 2020-02-11 13:35:01 -05:00
Jordan Brown d930e8f013 Merge pull request #49284 from tgstation/censored 
Moves duplicate CID/IP logging to log_admin_private()
 2020-02-11 13:32:25 -05:00
Jordan Brown 3b943b733f Merge pull request #49281 from Dennok/patch-4 
Monkey attack fix.
 2020-02-11 13:29:55 -05:00
Denton c39fecf80f Moves duplicate CID/IP logging to log_admin_private() 2020-02-10 20:46:01 +01:00
itseasytosee 870a6e5bbd [READY] Omega soap (#49265) 
* Omega soap

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

Co-Authored-By: swindly <swindly_tg13@aol.com>

Co-authored-by: swindly <swindly_tg13@aol.com>
 2020-02-10 20:03:29 +01:00
itseasytosee 1b9e220fc4 Rasalgethi (#49256) 2020-02-10 20:00:57 +01:00
Fikou ae39ad9c00 fixes xeno numbers being 0 + royal xenos also get numbers (#49262) 
* fixes beno numbers

* royals now get numbers too

* fixes beno numbers
 2020-02-10 19:59:22 +01:00
Dennok 4531791892 Monkey attack fix 
Now monkeys use weapons in some advanced way.
 2020-02-10 19:19:30 +02:00
AnturK e40e22da6b Another runtime fixes batch. (#49209) 
* Slime gland runtime fix.

* Logout ahelp logging runtime.

* Crafting non-items runtime.

* Turret building runtime.

* spacevine runtime.

* forcesay runtime fix.

* One less var
 2020-02-10 10:50:36 -05:00
Buggy123 39ccfdbbad Nuke Ops reinforcements now work on-station 2020-02-09 18:26:00 -05:00
Tlaltecuhtli 43f37969aa Fix plumbing constructor chemical grinders (#49037) 
* 1

* Update grinder_chemical.dm

* reset travis

* Update grinder_chemical.dm

* it works anyway
 2020-02-08 15:25:50 -05:00
itseasytosee dcd816991c Plasmeme (#49229) 2020-02-08 15:18:46 -05:00
nightred 3dd1924d45 Fixes for plastic bottle splashing (#49109) 
* fixes for plastic bottle splashing

* order was off
 2020-02-08 15:11:56 -05:00
Jordan Brown d69cb0e34d Merge pull request #49188 from JJRcop/defib_nanites_check 
Defib and Nanite Defib use the same can_defib proc
 2020-02-08 15:09:39 -05:00
Jordan Brown 998db2f932 Merge pull request #49223 from OnlineGirlfriend/sol-crushing 
adds sol dry crushed can sprite
 2020-02-08 15:05:06 -05:00
Jordan Brown c170c8cb34 Merge pull request #49220 from Coconutwarrior97/AICarpSpriteFix 
Fixes AI's carp hologram.
 2020-02-08 15:00:59 -05:00
JJRcop 518a28d50b Fix BADDNA brains transferring minds (#49214) 2020-02-08 15:00:04 -05:00
itseasytosee 31ffa4a2da Tastes like nothing (#49240) 2020-02-08 14:57:50 -05:00
itseasytosee de8c5192d3 Gramma (#49241) 2020-02-08 14:52:39 -05:00
OnlineGirlfriend ce2a42dd37 Update snacks_meat.dm (#49228) 
adds filling color and smoke taste to salami
 2020-02-07 19:03:50 -05:00
moo 2432f17ac9 Strange Reagent Rebalance (Mainly Nerfs to Min Req and Free Healing) (#49082) 
* 🐈

* 🐕

* it now churns out at 0.5 instead of 0.5 * define

and now uses ingest

* 🐟

* desc
 2020-02-08 00:16:57 +01:00
Jonathan (JJRcop) Rubenstein c52403f7fa Nanite defib uses can_defib proc 2020-02-07 18:04:48 -05:00
Jonathan (JJRcop) Rubenstein 3b1b4c293a Move can_defib proc to carbon 2020-02-07 18:02:30 -05:00
Fikou 8deeceefb6 [READY] Adds rideable Goliaths (#49003) 
* adds rideable goliaths

* stamding on the emdge

* plems work

* this should be it

* FUCK YOU TRAVIS

* primal friendly

* ok athath buddy

* mmm grayons

* sprite gang

* placeholder sprite, works till someone makes a new one maybe haha

* lets do this

* An object tames a monstrous beast somehow. More news at 5.
 2020-02-07 17:00:07 +01:00
Arkatos1 cd2a685ee8 tgui-next: Mining Vendor (#48991) 
* Mining Vendor tgui-next

* Formatting

* Revert "Formatting"

This reverts commit 2eb35516b2f755d78341915a4b57b2b8548195eb.
 2020-02-07 16:59:10 +01:00
SteelSlayer 21fd1b25ee Adds the dunkable element (#49192) 
* Adds the dunkable component

* Makes this an element instead

* early return

* makes this a bespoke element

* istype check for container
 2020-02-07 10:30:06 -05:00
Krysonism 5cd49e81ed [READY]Da ice cream update 2: On a stick. Adds 5 new ice creams. (#48995) 
* blob

* nogga black recipe and fix.

* adds food types and fixes empty ice creams.
 2020-02-07 15:20:33 +01:00
cacogen 9436ed69a8 Makes abductor baton child of stun baton (#48766) 
* Makes abductor baton child of stun baton


- Clarify var names and reorder vars in baton defines
- Slightly simplify active baton wash code

* forget about ()
 2020-02-07 14:53:14 +01:00
ArcaneMusic 38a675b544 [READY]Adds a new minor reward to the BEPIS, Party Pods. (#48654) 
* Initial commit, adding to minor techs after

* Adjusts window size, adds as a minor reward.

* english good me do

* I swear, really officer, I'm not drunk, I just can't type

* Alright fine maybe I should sleep

* FINE we'll go with this. I legitimately don't even drink

* Alright this clearly isn't working yet.

* Fixes touch reagents, and gives lead acetate some real-life symptoms thanks EOB

* _Perfection_

* Nobody told me I was conflict with my own file!

* Allows for touch reactions in a slightly more sane way. Hopefully.

* alright holup

* Minor minor change to the UI so that the menu doesn't clip anymore, swapped for the other barber's aid.

* Hairgrowth works now

* Fixes merge conflicts?
 2020-02-07 14:52:29 +01:00
Jordan Brown 910489bbb2 Revert some admin button moves (#49216) 
- Moves "Start Now" and "Delay Pre-Game" back to Server tab
 2020-02-06 21:27:28 -05:00
OnlineGirlfriend 512f76572d Merge branch 'master' into sol-crushing 2020-02-06 13:30:16 -08:00
OnlineGirlfriend ba78bd89e2 adds sol dry crushed can sprite 
adds icon for crushed sol dry
ginger_ale icon now named sol_dry
 2020-02-06 11:45:23 -08:00
Coconutwarrior97 34566bab9b Fixes icon path for carp hologram. 2020-02-06 04:45:41 -06:00
Jordan Brown 134d4d74a9 Merge pull request #49184 from peoplearestrange/master 
Removes "Special Verbs" category & reorganises admin buttons categories
 2020-02-05 09:44:30 -05:00
wesoda25 8847c5eb4f Lung damage makes you cough (#49014) 
* Update lungs.dm

* Update tgstation.dme

* brain

* onprocess not onspawn oops

* Update tgstation.dme

* please

* Update lungs.dm

* hopefully less shitcode

* thx bro
 2020-02-04 16:07:59 -05:00
skoglol a28b24f149 Completely removes cloning (#48668) 
* Removed from code

* Removes cloners from maps

* Some more references, now compiles.

* Reduces availability of replica pods

* DNA scanner and tech disk rebranding

* pubby door name, cargo pack description
 2020-02-04 16:04:06 -05:00
peoplearestrange 6070541c56 changes to category 
changes Administration to Admin
 2020-02-04 20:23:55 +00:00
peoplearestrange c8bd6a175d changes to category 
changes Administration to Admin
 2020-02-04 20:23:30 +00:00
peoplearestrange 060d16d5eb Changes to category 
changes Administration to Admin
 2020-02-04 20:23:13 +00:00
peoplearestrange a9cfc9290c changes to category 
changes Administration to Admin
 2020-02-04 20:22:44 +00:00
peoplearestrange 19f7bd4cd1 Changes to category 
changes Administration to Admin
 2020-02-04 20:22:08 +00:00