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

1344 Commits

Author SHA1 Message Date
LetterJay 1b6b8a7c00 Update cleanable.dm 2017-12-19 17:46:15 -06:00
LetterJay 0a05b499fd Update cleanable.dm 2017-12-19 17:14:57 -06:00
LetterJay a8db6dc9c2 Update mop_bucket.dm 2017-12-19 15:29:36 -06:00
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
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
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
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08: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
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 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
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
Mark9013100 a68b5bd3cb Adds extra labcoats to medical wardrobe (#33467) 2017-12-12 14:27:22 -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
deathride58 57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152 
[MIRROR] Airlock Construction Update
 2017-12-10 23:49:51 +00:00
deathride58 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
deathride58 6a8cffc3d5 Update implantuplink.dm 2017-12-10 18:03:04 -05:00
deathride58 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
deathride58 7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
deathride58 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
uraniummeltdown d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
LetterJay 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
oranges d88bff9fa9 Restores the uplink modules, removes LoadComponents 2017-12-10 14:14:37 -06:00
Anonmare 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
coiax 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
oranges c59209a34f Merge pull request #33392 from vuonojenmustaturska/patch-1 
[s]Ghost altclick fix for pet carriers
 2017-12-10 02:53:02 -06:00
deathride58 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 Brown 70be12aa1c Merge pull request #33241 from swindly/suicide 
Adds some suicide acts
 2017-12-09 15:52:53 -06:00
Jordan Brown 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
deathride58 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
deathride58 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
Dax Dupont 513a15f463 Prevents grilles from magically regenerating (#33357) 2017-12-08 12:24:12 -06:00
deathride58 bc4b689d56 Update medical.dm 2017-12-08 12:23:03 -05:00