shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,855 Commits 5 Branches 0 Tags
4d79c5ef09e5057ea2b5366eefb0ff30bfa031a2
Commit Graph

317 Commits

Author SHA1 Message Date
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
deathride58
293f484535 Merge pull request #7108 from Citadel-Station-13/kevinz000-patch-9 
removes magicarp from gold cores
 2018-06-26 14:05:43 -04:00
deathride58
be532c5c7f Merge pull request #7079 from Citadel-Station-13/kevinz000-patch-7 
hopefully fixes kinkmates dropping boozeomat parts
 2018-06-26 14:04:27 -04:00
deathride58
0d522533b7 Merge pull request #7078 from Michiyamenotehifunana/powercrepe-in-nam 
Adds a tiny "pocket" to the M1 Helmet (flak helmet)
 2018-06-26 14:04:13 -04:00
deathride58
aee56b1f3d lets dogborg tongues reduce firestacks when they lick faces (#7148) 2018-06-18 11:53:59 -07: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
kevinz000
a9100a89a6 modularize 2018-06-14 15:35:25 -07:00
ShizCalev
901dd94253 Corrects climax cooldown timer message, makes relieve message pronounsensitive (#7086) 2018-06-13 19:27:19 -07:00
kevinz000
e86c48b7a2 Update vending.dm 2018-06-12 03:51:03 -07:00
Michiyamenotehifunana
b62b9de0c1 Adds a tiny "pocket" to the M1 Helmet 2018-06-12 16:02:25 +08:00
deathride58
ecd200a5bc Merge pull request #7043 from Cw3040/master 
Small Cryosleeper Bug Fix and Box Map Fix
 2018-06-12 03:16:40 +00:00
Michiyamenotehifunana
a6966e2a97 Adds a (mostly) cosmetic flak jacket and helmet (#7045) 2018-06-10 12:31:54 -07:00
LetterJay
108ff89719 Dark Carapace - Donator Item (#7055) 
* donator

* POWERGAME
 2018-06-10 12:28:58 -07:00
Cw3040
93b97528c0 Fixing my syntax errors 
to make travis not yell at me
 2018-06-08 14:48:27 -04:00
Cw3040
dee92640a8 Cryosleeper Bug Fix 
Adds Cyborg weapon modules to var/list/do_not_preserve_items for
Cryosleepers, hopefully eliminating a bug where borg gun modules drop on
cryosleep.
 2018-06-08 14:33:40 -04: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
1042fa8ff1 Adds @CitadelBot wheelofsalt command (#7005) 
* adds the wheel of salt chat command to tgs3

* fuck i missed a couple things
 2018-06-05 11:15:51 -07:00
LetterJay
26a24e49b7 Update __donator.dm 2018-06-03 09:02:44 -05:00
LetterJay
85ba48a053 donator item 2018-06-03 09:01:17 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
CitadelStationBot
7bb6bc8dd3 [MIRROR] HoP/QM have access to vault (#6818) 
* Vault Access for QM (#37880)

* HoP/QM have access to vault

* Update captain.dm
 2018-05-27 17:25:18 -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
LetterJay
b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
 2018-05-24 11:58:57 -05:00
LetterJay
d19ecc5a4f Update magweapon.dm 2018-05-24 11:21:33 -05:00
LetterJay
e79113faca Update all_nodes.dm 2018-05-24 11:21:04 -05:00
deathride58
99d78cb07a Merge branch 'master' into poojgoneplzrevert 2018-05-24 03:28:39 +00:00
deathride58
be4902d195 tones down particle defender stamloss (#6761) 2018-05-23 12:15:58 -07:00
deathride58
5f60f30700 Adds custom say verbs, makes yelling echo and penetrate walls, makes distant voices have small text (#6615) 
* adds custom say emotes, makes yelling penetrate walls and echo throughout areas

* Update say.dm

* Update say.dm

* Update say.dm

* Update mob.dm

* makes yelling unable to penetrate space
 2018-05-23 12:14:18 -07: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
e415aac87a missed one 2018-05-21 08:38:09 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
LetterJay
1e207a7430 modular_citadel 2018-05-20 23:04:13 -05:00
LetterJay
0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646 
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
 2018-05-15 00:47:59 -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
LetterJay
a98e1387c1 trait => quirk 2018-05-14 12:31:49 -05:00
LetterJay
4fcca6ea4c Update custom_items.dm 2018-05-13 07:26:57 -05:00
LetterJay
38628753d1 Update __donator.dm 2018-05-13 07:26:44 -05:00
LetterJay
1e84547584 Update custom_items.dm 2018-05-13 07:26:15 -05:00
LetterJay
1a1341989d labcat thingy 2018-05-13 07:06:27 -05:00
LetterJay
1fbc06234f Update __donator.dm 2018-05-05 07:24:37 -05:00
LetterJay
bbebcc85e7 Update __donator.dm 2018-05-05 07:23:33 -05:00
deathride58
184441eb38 Merge pull request #6078 from Commandersand/LOADOUT 
MORE LOADOUT STUFF
 2018-05-02 17:29:44 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
ab3c55ab23 replaces randomized wires with departmental wires (#6376) 2018-04-27 07:42:09 -07:00