shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,301 Commits 5 Branches 0 Tags
8d6d56195028dc037159298ff79caf86626225c2
Commit Graph
2682 Commits
Author SHA1 Message Date
vuonojenmustaturskaandCitadelStationBot fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
ShizCalevandCitadelStationBot 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
deathride58andGitHub 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
AnturKandCitadelStationBot db3afb8ee1 This is still pretty terrible (#33495) 2017-12-13 21:09:30 -06:00
deathride58andGitHub 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
deathride58andGitHub bd2010eabb Update bins.dm 2017-12-13 16:46:18 -05:00
deathride58andGitHub 08af4665b4 Update implant.dm 2017-12-13 16:45:54 -05:00
vuonojenmustaturskaandCitadelStationBot 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
deathride58andGitHub 1a1e03490a Update gygax.dm 2017-12-13 12:02:50 -05:00
Jordan BrownandCitadelStationBot 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 BrownandCitadelStationBot 129cd705d1 Correctly set description of nonstandard cells 2017-12-13 09:12:55 -06:00
deathride58andGitHub 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
Mark9013100andCitadelStationBot a68b5bd3cb Adds extra labcoats to medical wardrobe (#33467) 2017-12-12 14:27:22 -06:00
RobustinandCitadelStationBot 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
deathride58andGitHub 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
swindlyandCitadelStationBot 1a15772c3a Makes swarmers check for mobs in objects (#33425) 2017-12-11 20:38:28 -06:00
AnturKandCitadelStationBot c5013d65f6 Adds "Get" command to movable vv dropdown (#33296) 2017-12-11 20:35:16 -06:00
CitadelStationBotandkevinz000 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
FrozenGuy5andCitadelStationBot 89e8ccba5b Corrects the icon_state for an oxygen tank (#33443) 2017-12-11 11:30:16 -06:00
deathride58andGitHub ccd370328c Merge branch 'master' into upstream-merge-33316 2017-12-11 00:01:02 +00:00
deathride58andGitHub cdc23ad79e Merge pull request #4240 from Citadel-Station-13/upstream-merge-33265 
[MIRROR]  Good Clean Fun: A vending machine for games!
 2017-12-10 23:50:05 +00:00
deathride58andGitHub 57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152 
[MIRROR] Airlock Construction Update
 2017-12-10 23:49:51 +00:00
deathride58andGitHub 6e6b85c01a Merge pull request #4311 from Citadel-Station-13/upstream-merge-33276 
[MIRROR] Restores the uplink modules, removes LoadComponents
 2017-12-10 23:49:25 +00:00
deathride58andGitHub 6a8cffc3d5 Update implantuplink.dm 2017-12-10 18:03:04 -05:00
deathride58andGitHub bfa573f4bd Update alarmlock.dm 2017-12-10 17:46:50 -05:00
deathride58andGitHub 216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935 
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
 2017-12-10 22:43:58 +00:00
deathride58andGitHub a38ccf078b Update borer.dm 2017-12-10 16:59:46 -05:00
deathride58andGitHub 7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
deathride58andGitHub 4b0137d62e Merge pull request #4308 from Citadel-Station-13/upstream-merge-33418 
[MIRROR] Fixes booze-o-mats not having booze
 2017-12-10 21:42:58 +00:00
uraniummeltdownandCitadelStationBot d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
LetterJayandGitHub d82698d106 Merge pull request #4302 from Citadel-Station-13/upstream-merge-33280 
[MIRROR] Add caltrop component for spikey floor objects
 2017-12-10 14:20:40 -06:00
orangesandCitadelStationBot d88bff9fa9 Restores the uplink modules, removes LoadComponents 2017-12-10 14:14:37 -06:00
AnonmareandCitadelStationBot 52da86e214 Fixes booze-o-mats not having booze (#33418) 
* Update vending.dm

* Update vending.dm

* Update vending_items.dm

* Adds a missing close parenthisis

* I'm drunk and blind, don't sue me

* Update vending_items.dm

* Update vending_items.dm
 2017-12-10 13:20:06 -06:00
coiaxandCitadelStationBot 9d59e36289 Add caltrop component for spikey floor objects (#33280) 
* Add caltrop component for spikey floor objects

The caltrop component now can be added to any crossable atom, and it'll
act like a shard of glass, or a d4. Additional flags are possible for it
to bypass shoes or ignore people who are walking.

This means d4 don't reimplement shard logic, and also open the window
for caltrop grenades later.

Also, it taught me how components work.

* Code review I

* Caltrop damage is 4

* Cactus hurts

* Whoops

* Ignore restraints = true
 2017-12-10 10:32:03 -06:00
orangesandCitadelStationBot c59209a34f Merge pull request #33392 from vuonojenmustaturska/patch-1 
[s]Ghost altclick fix for pet carriers
 2017-12-10 02:53:02 -06:00
deathride58andGitHub 6ef12d993b Merge pull request #4289 from Citadel-Station-13/upstream-merge-33263 
[MIRROR] People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
 2017-12-10 03:09:28 +00:00
Jordan BrownandCitadelStationBot 70be12aa1c Merge pull request #33241 from swindly/suicide 
Adds some suicide acts
 2017-12-09 15:52:53 -06:00
Jordan BrownandCitadelStationBot 00c17ad6e5 Merge pull request #33263 from kevinz000/patch-402 
People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
 2017-12-09 15:52:35 -06:00
deathride58 742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
 2017-12-08 19:58:41 -05:00
deathride58andGitHub 7ca945c96b Merge pull request #4278 from Citadel-Station-13/upstream-merge-33370 
[MIRROR] Fixes certain material containers
 2017-12-08 19:35:43 +00:00
deathride58andGitHub 0c8bdab295 Merge pull request #4279 from Citadel-Station-13/upstream-merge-33357 
[MIRROR] Prevents (cat)grilles from magically regenerating.
 2017-12-08 19:06:46 +00:00
deathride58andGitHub 9715e9c685 Merge pull request #4232 from cebutris/borers 
Removes borer event from rotation
 2017-12-08 18:52:58 +00:00
deathride58andGitHub 53ab4feb2f Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324 
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 18:47:56 +00:00
deathride58andGitHub 665cef7a35 Merge pull request #4260 from Citadel-Station-13/upstream-merge-33231 
[MIRROR] Adds pet carriers
 2017-12-08 18:46:07 +00:00
deathride58andGitHub 6c774d7798 Update mech_fabricator.dm 2017-12-08 13:43:33 -05:00
Dax DupontandCitadelStationBot 513a15f463 Prevents grilles from magically regenerating (#33357) 2017-12-08 12:24:12 -06:00
Jordan BrownandCitadelStationBot dfaa796fc2 Fixes certain material containers 2017-12-08 12:11:46 -06:00
deathride58andGitHub bc4b689d56 Update medical.dm 2017-12-08 12:23:03 -05:00
deathride58andGitHub d826217439 Merge pull request #4261 from Citadel-Station-13/upstream-merge-33235 
[MIRROR] Slime Blueprint Change
 2017-12-08 17:18:22 +00:00
Jordan BrownandCitadelStationBot 8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen 
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 10:35:23 -06:00