shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,455 Commits 5 Branches 0 Tags
d59e85e2144501beebb7782eef280db4d704f8a6
Commit Graph

2712 Commits

Author SHA1 Message Date
LetterJay
d59e85e214 Update weldingtool.dm 2017-12-19 15:20:39 -06:00
ACCount
522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
XDTM
6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209) 
* Adds abductor Mind Interface Devices, and a gland HUD

* .
 2017-12-18 20:29:37 -06:00
LetterJay
5f237c595b Merge pull request #4436 from Citadel-Station-13/upstream-merge-33615 
[MIRROR] Adds reloading sounds to guns
 2017-12-18 15:51:06 -06:00
LetterJay
06617159b7 Merge pull request #4428 from Citadel-Station-13/upstream-merge-33419 
[MIRROR] Lollipop dispensers can push lollipops into people's hands
 2017-12-18 15:27:03 -06:00
LetterJay
da58957c23 Merge pull request #4425 from Citadel-Station-13/upstream-merge-33607 
[MIRROR] Dance Machine now obeys instrument preference
 2017-12-18 15:26:33 -06:00
LetterJay
4a835b47ce Merge pull request #4417 from Citadel-Station-13/upstream-merge-33586 
[MIRROR] Disables clockcult power alerts to ghosts when it's not clockcult
 2017-12-18 15:25:46 -06:00
LetterJay
97a321bc82 Merge pull request #4414 from Citadel-Station-13/upstream-merge-33553 
[MIRROR] Rebalances Marauder shields
 2017-12-18 15:21:07 -06:00
LetterJay
0643aa4fc0 Merge pull request #4399 from Citadel-Station-13/upstream-merge-33542 
[MIRROR] Fixes mecha drifting.
 2017-12-18 15:19:13 -06:00
ShizCalev
1c142356ff Gun sounds (#33615) 2017-12-18 15:15:25 -06:00
LetterJay
bd1c186111 Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181 
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
 2017-12-17 21:26:08 -06:00
LetterJay
3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519 
[MIRROR] Finishes the forceMove port
 2017-12-17 20:28:07 -06:00
LetterJay
eb9260c8bf Update implantcase.dm 2017-12-17 17:38:09 -06:00
coiax
a2dbbac703 Lollipop dispensers can push lollipops into people's hands (#33419) 
* Lollipop dispensers can push lollipops into people's hands

🆑 coiax
add: A lollipop dispenser in "dispense lollipops" mode can push the
lollipop straight into the targets hand, rather than getting it dirty on
the floor first.
/🆑

Also tidied up and around the robot_items.dm file.

This is a good idea because then you can give people lollipops as a
cyborg that has the lollipop dispenser module.

* Integers instead of numbers
 2017-12-17 16:17:28 -06:00
oranges
ac95eb06e8 Dance Machine now obeys instrument preference (#33607) 2017-12-17 15:02:31 -06:00
Leo
a536831bbb Merge pull request #33586 from Xhuis/power_alerts 
Disables clockcult power alerts to ghosts when it's not clockcult
 2017-12-17 07:36:10 -06:00
Robustin
e71fa098ae Shield balance (#33553) 
Rebalances Marauder shields
 2017-12-17 04:11:24 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
AnturK
ce22210b47 Fixes mecha drifting. (#33542) 
* Fixes mecha drifting.
 2017-12-16 04:09:03 -06:00
deathride58
b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
deathride58
5c4d9576db Merge pull request #4383 from Citadel-Station-13/upstream-merge-33216 
[MIRROR] Player Z-tracking, again
 2017-12-15 04:20:50 +00:00
deathride58
c4b7b940d2 Merge pull request #4345 from Citadel-Station-13/upstream-merge-33475 
[MIRROR] Antag spawner fixes
 2017-12-15 04:20:27 +00:00
vuonojenmustaturska
c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
deathride58
ba928eae5e Update light.dm 2017-12-14 17:23:42 -05:00
deathride58
8beeeefa44 Update items.dm 2017-12-14 17:23:09 -05:00
nicbn
6f9ecf2f32 New closet sprites (#33207) 
They're new sprites deal with it
 2017-12-14 15:49:49 -06:00
Ashe Higgs
2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
deathride58
37851fe771 Update antag_spawner.dm 2017-12-14 14:36:19 -05:00
ShizCalev
712b86089d Adds new gun dry firing sounds (#33503) 
* Adds new gun dry firing sounds

* Don't want to hear click when you want to hear bang
 2017-12-14 06:15:11 -06:00
deathride58
7ca4a29cac Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465 
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
 2017-12-14 03:54:31 +00:00
AnturK
db3afb8ee1 This is still pretty terrible (#33495) 2017-12-13 21:09:30 -06:00
deathride58
dbd08a18a4 Merge pull request #4349 from Citadel-Station-13/upstream-merge-33481 
[MIRROR] Correctly set description of nonstandard cells
 2017-12-13 21:47:57 +00:00
deathride58
bd2010eabb Update bins.dm 2017-12-13 16:46:18 -05:00
deathride58
08af4665b4 Update implant.dm 2017-12-13 16:45:54 -05:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
deathride58
1a1e03490a Update gygax.dm 2017-12-13 12:02:50 -05:00
Jordan Brown
057d05df91 Merge pull request #33484 from vuonojenmustaturska/eminencefix 
Fixes glass shard/bananium floor behavior for cameras and ghosts
 2017-12-13 09:14:16 -06:00
Jordan Brown
129cd705d1 Correctly set description of nonstandard cells 2017-12-13 09:12:55 -06:00
oranges
a17af0530d Merge pull request #33475 from AnturK/ineedtocleanuptheselater 
Antag spawner fixes
 2017-12-12 20:02:55 -06:00
deathride58
c339a603db Merge pull request #4341 from Citadel-Station-13/upstream-merge-33467 
[MIRROR] Adds extra labcoats to medical wardrobe
 2017-12-13 01:24:20 +00:00
Mark9013100
a68b5bd3cb Adds extra labcoats to medical wardrobe (#33467) 2017-12-12 14:27:22 -06:00
Robustin
685bf8b48c Both cult revive runes will now replace braindead/AFK cultists (#33206) 
* "Revive" AFKs

* "Revives" inactive clock cultists

* AFK boot notice

* Missing parenthesis

* Revive targets correct mob

* Poll fix

* Fixes inactive revive mob

* Suicide Counter
 2017-12-12 13:48:18 -06:00
deathride58
151ba66ed4 Merge pull request #4331 from Citadel-Station-13/upstream-merge-33425 
[MIRROR] Makes swarmers check for mobs in objects
 2017-12-12 03:23:20 +00:00
swindly
1a15772c3a Makes swarmers check for mobs in objects (#33425) 2017-12-11 20:38:28 -06:00
AnturK
c5013d65f6 Adds "Get" command to movable vv dropdown (#33296) 2017-12-11 20:35:16 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
FrozenGuy5
89e8ccba5b Corrects the icon_state for an oxygen tank (#33443) 2017-12-11 11:30:16 -06:00
deathride58
ccd370328c Merge branch 'master' into upstream-merge-33316 2017-12-11 00:01:02 +00:00