coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
53,442 Commits 9 Branches 11 Tags
b88dbd301a8ff50101468fd5192fa2d7c58a94de
Commit Graph

10683 Commits

Author SHA1 Message Date
TrustyGun 1db56a3d58 Clown Toy Box + Wooden Crates (#28227) 2017-06-09 13:01:51 -03:00
kevinz000 d8abfaa0fd Create manned_turret.dm (#28215) 2017-06-09 10:41:04 +02:00
Joan Lung 7ec67bc960 Merge pull request #28202 from Tacolizard/medalmemesv2ultra 
Gives the RD and HoS medal lockboxes
 2017-06-08 21:36:06 -04:00
ShizCalev f2d829261a [Typo] Duffel Bag (#28200) 2017-06-08 19:16:20 -03:00
Jordan Brown 23eb6e4aec Merge upstream 2017-06-08 16:30:35 -04:00
Tacolizard 5ea7095875 remake 2017-06-08 12:35:32 -07:00
kevinz000 596ef51039 Merge remote-tracking branch 'tgstation/master' into gang_points_refactor 2017-06-08 11:05:12 -07:00
Jordan Brown f4ffde7a09 Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-08 12:54:27 -04:00
Joan Lung 81ae23ace9 Merge pull request #28189 from Xhuis/defib_paddle_fix 
Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them
 2017-06-08 11:57:30 -04:00
Joan Lung 93bf75b576 Merge pull request #28178 from Expletive/detectivehair 
Adds 91 new sprites for the Detective's Fedora and gives it some better booze.
 2017-06-08 11:50:55 -04:00
QualityVan 02bb8d0dc4 Adds creamatoriums (#28158) 2017-06-07 22:44:38 -03:00
Joan Lung 405fc7b0fe Adds Prolonging Prism as an application scripture (#28164) 2017-06-07 22:43:03 -03:00
Joan Lung fdcded4530 Merge pull request #28159 from QualityVan/cremoffbyone 
Fixes being unable to cremate one thing
 2017-06-07 20:26:12 -04:00
Joan Lung 0832c97527 Merge pull request #28163 from QualityVan/zerocables 
Prevents cyborgs from extruding materials
 2017-06-07 20:25:05 -04:00
Jordan Brown 5bbbd26739 Merge branch 'master' into goonchatv3 2017-06-07 20:06:46 -04:00
Leo 48649596e2 Merge pull request #28150 from ShizCalev/ce-belt 
Fixes CE's hand drill changing size
 2017-06-07 16:14:08 -03:00
Expletive 250725732d Curator has a proper wardrobe now. 2017-06-07 09:22:11 -07:00
Expletive 78473ac024 Resprite fedoras, Curator and Detective hats are now subtypes of fedora. All benefit from hair extensions 2017-06-07 09:03:19 -07:00
Xhuis 60073e279e Removes NODROP from defibrillator paddles 2017-06-07 12:01:06 -04:00
Leo 4f3d720c93 Merge pull request #28124 from Shadowlight213/whywasthisevenadded 
Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones
 2017-06-07 11:07:13 -03:00
Expletive 8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
Joan Lung 55d4fb8cca Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power (#28108) 2017-06-06 22:18:14 -03:00
QualityVan 8c33045cd9 Prevents cyborgs from extruding materials 2017-06-06 20:02:24 -04:00
swindly b976845de3 Weaponizes station charters (#28111) 2017-06-06 20:40:01 -03:00
QualityVan 4a1bc314c3 Fixes being unable to cremate one thing 2017-06-06 18:46:52 -04:00
shizcalev eb3756b8eb fixed 
fixes #28120
fixes #28136
 2017-06-06 15:36:25 -04:00
kevinz000 703cff4953 Merge branch 'master' into gang_points_refactor 2017-06-06 08:48:51 -07:00
Jordan Brown ccfaf07a5a Merge branch 'goonchatv3' of https://github.com/Cyberboss/tgstation; branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-06 09:18:44 -04:00
Leo c1749f4fa4 Merge pull request #28091 from Expletive/fix28082 
Fixes #28082 : Private Security cutouts have icons.
 2017-06-06 09:12:26 -03:00
Robustin af34882816 Last Cult Master Spell: Eldritch Pulse & Various Tweaks (#27722) 
* funMaster

* now teleports + telegraphs

* Update cult_comms.dm

* Delta REEEEE

* Done but still needs a couple more touches

* Update cult_comms.dm

* Finished & 150 hours tested

* Reworded

* plz dont break

* ok
 2017-06-06 11:06:08 +02:00
Shadowlight213 0150de51c3 Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones 2017-06-05 20:58:12 -07:00
kevinz000 fc92585c1c Fixes smashing people on tables (#28077) 2017-06-05 22:37:22 -03:00
Leo ad49bbf329 Merge pull request #28078 from kevinz000/patch-206 
Fixes dead people being able to aim a machinegun
 2017-06-05 22:36:50 -03:00
thefastfoodguy 2bdd2342a6 Flashlight suduko (#28053) 2017-06-05 18:27:44 -03:00
WJohn f6063b936f Adds some more syndicate equipment. (#28046) 2017-06-05 15:50:11 -03:00
Joan Lung 5884071627 Renames Clockwork Proselytizers to Replica Fabricators (#28062) 2017-06-05 14:52:31 -03:00
Leo 9dee214c17 Merge pull request #28031 from kevinz000/exalted12 
Powercreeps HoS fashion - Adds grey HoS uniform to all maps!
 2017-06-05 11:13:37 -03:00
Expletive 506a351f16 Fix #28082 2017-06-05 01:46:36 -07:00
InsaneHyena 5713a44048 Removes donut steelpoint (#28041) 2017-06-05 00:12:26 -03:00
kevinz000 9daa5af6af Update manned_turret.dm 2017-06-04 18:53:13 -07:00
Joan Lung d5e608807f Only human and silicon servants can help recite multi-invoker scriptures (#28049) 2017-06-04 21:22:55 -03:00
Jordan Brown d7ebd649ba Refactors the latejoin list (#26647) 2017-06-04 17:07:46 -03:00
kevinz000 8c065b05c9 Flying mobs don't smash tables 2017-06-04 17:38:32 +01:00
AnturK 74febcf7bc Fixes bsa not showing up (#28032) 2017-06-04 09:42:50 -03:00
oranges ca6f4cfc35 refactor another spawn cooldown (#28022) 2017-06-04 12:29:41 +02:00
oranges 9e28fd8ae7 Another spawn timer (#28018) 2017-06-04 12:23:10 +02:00
Leo 477bd09609 Merge pull request #27948 from swindly/grenade_buff 
Buffs chemical grenades
 2017-06-03 23:38:51 -03:00
Cheridan aad23d5304 Merge pull request #27964 from Expletive/variablestacksize 
[READY] Stacks will change item_states and w_class based on how full they are.
 2017-06-03 19:02:57 -05:00
Jordan Brown 0d753d862b Add the ability for all objects to use explosion_block (#27971) 2017-06-03 17:41:51 -05:00
kevinz000 cc340cb73b stuff 2017-06-03 14:00:14 -07:00