Commit Graph

89 Commits

Author SHA1 Message Date
Poojawa
30dbc57e75 Labcoats carry mk II hypos, kits hold more 2019-04-11 06:55:57 -05:00
Ragolution
890a23df52 Github client is shit.
Ooga
2019-03-14 00:16:11 -04:00
Ragolution
8cc589b069 Actually fixes the thing.
Turns out this was 100% easier to fix than I thought.
2019-03-14 00:03:37 -04:00
LetterJay
0015e806ab donation item 2019-01-13 02:36:15 -06:00
Poojawa
d429eb67cd remodularize vtec code
Works as expected now but, combat rework meme jog/spring override speeds
2018-10-20 07:19:19 -05:00
Poojawa
1d6355534c Unmodularizes vtech controls
I swear most of this shit just doesn't work in modularization anymore.
2018-10-20 04:18:09 -05:00
Poojawa
f34d94cd4d pretty much all modular code seems to turbo break 2018-10-13 00:39:28 -05:00
deathride58
212187620b Merge pull request #7599 from Poojawa/override-override
Digitigrade Uniforms from Oracle
2018-09-29 21:30:12 -04:00
Poojawa
f2faf66586 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into modular_cit_cleaning 2018-09-28 22:09:19 -05:00
Poojawa
2daa197605 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into override-override 2018-09-27 05:09:23 -05:00
Poojawa
4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
izzyinbox
9a98b92c58 fixes tennis ball equip slots (#7582) 2018-09-26 12:16:13 -07:00
Poojawa
4efdf4b0b3 Cleans up Modular_citadel
Yes I know it'll have merge conflicts later.
2018-09-21 03:52:13 -05:00
Poojawa
7d300117af literally everything Bhjin has been complaining about
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
2018-09-18 03:59:46 -05:00
Poojawa
dc9fd6db12 readds V-tech control, modularized properly 2018-09-17 22:35:43 -05:00
deathride58
4208d6ea5f Adds boombox donor item for Raiq/chefferz (#7368) 2018-08-03 19:29:19 -07:00
Bear
586d3a3456 super minor fix 2018-07-18 01:22:56 -04:00
Letter N
5c79a794ec Update holy_weapons.dm 2018-07-06 17:20:30 +08:00
Letter N
bff55cc362 Update handcuffs.dm 2018-07-06 17:19:56 +08:00
deathride58
cec2871db2 Merge pull request #7293 from LetterN/patch-4
fixes kinkmate
2018-07-06 01:36:15 -04:00
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
Letter N
493a356338 Update machine_circuitboards.dm 2018-07-02 09:13:28 +00:00
deathride58
4d79c5ef09 Merge pull request #7110 from Michiyamenotehifunana/Random-Donator-Thing-1
Adds the Not-Nanotrasen Corporate Uniform and a Silver Bike Horn
2018-06-26 14:06:32 -04:00
Cw 3040
27b6ebc612 Cw's Spaceruins, Maintbar and Kegspawn changes (#7141)
* Station Changes

-Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar),
and Omega (maintarcade)
-Added keg spawn to Pubby
-Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy
with the fact these were sprited identically to handcuffs, will re-add
if someone ports Virgo's legcuffs)

* Space Ruins Changes

-Added KinkMates to SpaceHotel
-Swapped riot helmet for AI detecting multitool on TurretedOutpost
-Changed the loot for oldAIsat to not have a suspicious toolbox, instead
having a toolbelt and combat gloves

* Kegspawn Change

Changed Spawn Rate of kegs to:
-50% mead (5 in 10 instead of 5 in 8)
-20% aphro (2 in 10 instead of 1 in 8)
-20% strong aphro (2 in 10 instead of 1 in 8)
-10% pan galactic gargle blaster (1 in 10 instead of 1 in 8)

* Small MetaStation Fixes

Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire
(and an air supply pipe) accidentally deleted.
2018-06-18 11:52:11 -07:00
Letter N
5813950aff fixes shock collars 2018-06-18 14:28:43 +08:00
Michiyamenotehifunana
e4e0e0d91d Adds random things for Jay to do things with 2018-06-15 13:50:15 +08:00
deathride58
4076078210 Adds table slamming as a right click interaction for tables (#7006)
* Adds table slamming as a right click interaction for tables

* and the DME, too. fuck.

* fixes compiling errors
2018-06-05 11:16:17 -07:00
deathride58
6ac830a123 Combat rework adjustments (Making use of 512's new filter feature, small balance tweaks, and more) (#6092)
* makes use of 512's filters, adds combat mode toggle component signals, and more

* Update phantomthief.dm

* Update living.dm
2018-05-27 17:18:40 -07:00
deathride58
99d78cb07a Merge branch 'master' into poojgoneplzrevert 2018-05-24 03:28:39 +00:00
LetterJay
42dd419f80 Update eutactic_blades.dm 2018-05-23 05:42:31 -05:00
LetterJay
e4c8e1b416 Update eutactic_blades.dm 2018-05-22 09:29:23 -05:00
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
a610e635f1 Update ids.dm 2018-05-22 08:00:04 -05:00
LetterJay
1e207a7430 modular_citadel 2018-05-20 23:04:13 -05:00
deathride58
b501677999 fuck 2018-05-14 19:48:45 -04:00
deathride58
799cc77f72 Emag QoL and addition of emag recharging 2018-05-14 19:05:38 -04:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
deathride58
87365ee74b getStaminaLoss() 2018-04-07 23:39:48 -04:00
Cebutris
3102b47775 Makes the desc more generic 2018-03-26 09:46:54 -04:00
Cebutris
2fd234256e adds lavaknight corpses to legion drops 2018-03-26 09:29:22 -04: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
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
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
deathride58
9517e3ad2e Merge pull request #5990 from Poojawa/digileg-runtime
Hopefully crushes some runtimes
2018-03-20 15:26:43 +00: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