shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,003 Commits 5 Branches 0 Tags
a9bdb032e7def4b87d556a638704fc09b13e1981
Commit Graph

186 Commits

Author SHA1 Message Date
Michiyamenotehifunana
a9bdb032e7 removes code bloat 2018-03-24 14:21:14 +08:00
LetterJay
cdf0ba3def Oops 2018-03-23 12:18:48 -05:00
LetterJay
41c6c4aa4b wrong location 2018-03-22 22:23:42 -05:00
LetterJay
09cd9189e3 fixes missing shock collar icon 2018-03-22 12:10:08 -05:00
LetterJay
b3b8c5c7e6 donator stuff, cleans up file 2018-03-21 23:00:47 -05:00
Poojawa
b4a7def5ca Hypospray kits and reworks! (#5907) 
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
 2018-03-21 15:28:06 -05:00
deathride58
0a331a26ee Merge pull request #5994 from Poojawa/beepboop 
Adds IPCs refractors preferences
 2018-03-21 19:20:43 +00:00
LetterJay
613d54ad4e Update __donator.dm 2018-03-21 00:36:40 -05:00
LetterJay
8797bdace1 donator cloak thing, going to bed 2018-03-21 00:29:11 -05:00
Poojawa
8377bdf9a8 fixes some screen issues 2018-03-20 23:53:55 -05:00
Poojawa
f3a806923c Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop 2018-03-20 23:00:12 -05:00
Michiyamenotehifunana
61fde978e1 Tennis Balls! (and donator stuff) (#5962) 
* Donator rainbow stuff and balls!

* Updates code and adds izzy's donator thing

* Adds right click memes!
 2018-03-20 19:11:34 -05:00
Poojawa
2bb09bef5f Adds additional screen 'faces', allows switching of screens in game 
also puts jelly people in with the jelly people file.
 2018-03-20 13:53:52 -05:00
Poojawa
af82e1109f slight tweaks, revert job controller changes, penor layering tweaked 2018-03-20 10:41:36 -05:00
deathride58
9517e3ad2e Merge pull request #5990 from Poojawa/digileg-runtime 
Hopefully crushes some runtimes
 2018-03-20 15:26:43 +00:00
LetterJay
15109ad50a Merge pull request #6029 from Citadel-Station-13/LetterJay-shockcollar 
Fixes autolathes not building shockcollars
 2018-03-20 10:10:36 -05:00
LetterJay
089c2e70b2 fixes runtime in donator 
fixes runtime in donator
 2018-03-20 09:34:22 -05:00
LetterJay
e01a0d521d Update shockcollar.dm 2018-03-19 23:44:13 -05:00
Poojawa
8cbdf9fcb4 Merge branch 'master' into digileg-runtime 2018-03-19 21:33:50 -05:00
Poojawa
088f3fda5d Gives a prompt for people to see who is replying to an mhelp (#5963) 2018-03-19 21:27:41 -05:00
Poojawa
d593e46c6b working as intended now and improved 2018-03-19 07:00:05 -05:00
Poojawa
b27c5cd3b0 Revert "SCREEE. fuck this. I'mma just revert at this point, but don't want to lose progress." 
This reverts commit a2fbab5ccb.
 2018-03-19 05:32:12 -05:00
Poojawa
a2fbab5ccb SCREEE. fuck this. I'mma just revert at this point, but don't want to lose progress. 2018-03-19 04:57:57 -05:00
Poojawa
d387481aa5 UI's functional again at least 2018-03-19 02:13:47 -05:00
Poojawa
b6c780df30 reee 
removes the empty catagory entry on gear loadout
 2018-03-19 01:02:04 -05:00
LetterJay
4f07c9f856 Merge pull request #5995 from Citadel-Station-13/donator 
sabre and sheath
 2018-03-18 22:03:11 -05:00
Poojawa
4db062c9c0 didn't fix anything, reee. but I have an idea 2018-03-18 20:20:20 -05:00
LetterJay
9e072fe328 Update __donator.dm 2018-03-18 19:28:51 -05:00
LetterJay
46733bca65 type path 2018-03-18 16:54:43 -05:00
LetterJay
e163a889fb i hate this shit 2018-03-18 15:53:20 -05:00
LetterJay
18759e03b3 op 2018-03-18 15:47:48 -05:00
LetterJay
380ec76618 sabre and sheath 2018-03-18 12:18:08 -05:00
Poojawa
8304a40969 probably fixes bad loadout tab things 2018-03-18 11:34:57 -05:00
Poojawa
acfee53a98 :HELP: MAINT 2018-03-18 11:26:00 -05:00
Poojawa
796e22beac LOCAL SUNE PORTS... OH GOD WHAT HAPPENED 
That feel when you're in the 'Oh, well while I'm here...' mindset.
 2018-03-18 09:02:13 -05:00
Poojawa
d6e7dcdf37 Merge branch 'master' into digileg-runtime 2018-03-17 20:16:21 -05:00
Poojawa
d3407f1711 a few other little runtimes 2018-03-17 20:03:21 -05:00
Poojawa
c8365e6be7 Hunts down some runtimes 
cleans up some dogborg sleeper code too
 2018-03-17 19:38:03 -05:00
deathride58
542208445b Merge pull request #5901 from NopeMcHaltman/cit_mood 
Some minor mood additions
 2018-03-17 23:56:50 +00:00
deathride58
063abf2a5d Makes xenobio consoles upgradeable via disks obtainable from bluespace research, makes most xenobio console abilities exclusive to disk upgrades (#5953) 
* Makes xenobiology consoles rely on upgrades, spreads out xenobio console abilities into upgrade disks

* Update xenobio_camera.dm
 2018-03-16 10:13:06 -07:00
Anonymous
95d9ff2328 Merge branch 'master' into cit_mood 
Handled Conflict with tgstation.dme
 2018-03-16 17:09:57 +03:00
Michiyamenotehifunana
b479e5fc7a [Ready for Review] Revamps Wish Granters (#5773) 
* Rebalances Wishgranters

* Removes accidental copypasta

* Revamps Wish Granters entirely!

* Finishes Wishgranter revamp, rebalances eutactic blades

* Adds more bonuses to wishgranter wishes, fixes unintentional nerf to Dragons Tooth

* Updates teleporter code to actually work

* Now with 120% more paranoia!
 2018-03-16 03:34:06 -07:00
deathride58
8923bb9488 Small combat balancing: Small crawling nerf, Esword buff (#5937) 
* adds a delay and message to crawling underneath people

* makes eswords take less stamloss to swing around, lays down groundwork for later parts of combat reworks

* FUCK
 2018-03-16 03:27:30 -07:00
Zna12
c2e95fc233 Oh that blob (#5934) 
Removed minimum player count for the blobs.
 2018-03-16 03:21:34 -07:00
Useroth
e4778dc751 Makes shock collars actually obtainable from KinkMates. (#5938) 2018-03-16 03:20:08 -07:00
Poojawa
31d988344a maybe actually have mentors that aren't broke as shit (#5954) 2018-03-15 20:49:32 -05:00
deathride58
035b3458de MDB fix attempt number two. (#5928) 
* HOPEFULLY fixes mapdiffbot

* attempt number 2
 2018-03-14 17:08:19 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
Zna12
cc6bab0c06 Foam Lasertag Darts (#5847) 
* Laser Tag Darts.

Darts that are compatable with the laser tag system

* Lastag Ammo Boxes. Autoylathe Update.

* Final bug fixes.
 2018-03-13 18:39:19 -05:00
Anonymous
542f9c63c7 Adds check if item is sharp 
So you won't get false negative mood for playing with plushes.
 2018-03-13 15:48:26 +03:00