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

1353 Commits

Author SHA1 Message Date
deathride58
b2187123fb Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405 
[MIRROR] [Ready]Brain Trauma additions
 2017-12-21 03:42:38 +00:00
deathride58
17dda62a93 Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622 
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-21 03:28:14 +00:00
deathride58
58f5069180 Merge pull request #4463 from Citadel-Station-13/upstream-merge-33664 
[MIRROR] Halve gun empty sound level
 2017-12-21 03:27:50 +00:00
deathride58
2de3b12364 Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594 
[MIRROR] Adds knock off component
 2017-12-21 03:25:41 +00:00
Jordan Brown
25d5e5b6b4 Merge pull request #33594 from AnturK/knockoff 
Adds knock off component
 2017-12-20 00:14:36 -06:00
Jordan Brown
b305f1bb26 Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears 
Halve gun empty sound level
 2017-12-20 00:14:28 -06:00
oranges
d960c45e77 Merge pull request #33622 from duncathan/assert_gas 
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-20 00:14:13 -06:00
LetterJay
74bba8aea7 Update cards_ids.dm 2017-12-19 19:31:44 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
kevinz000
8149f52777 Adds jousting (#33531) 2017-12-18 20:54:21 -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
4bf535f808 Update weldingtool.dm 2017-12-17 15:57:23 -06:00
LetterJay
75ccc3b354 Update anomalies.dm 2017-12-17 15:57:02 -06:00
XDTM
962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -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