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

10853 Commits

Author SHA1 Message Date
LetterJay
a8eaaff8e7 Merge pull request #7003 from Citadel-Station-13/upstream-merge-38173 
[MIRROR] Delay smoothing atoms that have not initialized yet
 2018-06-03 16:23:48 -05:00
LetterJay
37ff8a616d Merge pull request #7002 from Citadel-Station-13/upstream-merge-38225 
[MIRROR] Include item overlays in attack animations (shows the proper color of screwdrivers etc)
 2018-06-03 16:22:30 -05:00
LetterJay
9c4d7ca029 Merge pull request #7001 from Citadel-Station-13/upstream-merge-38228 
[MIRROR] we can stop using getFlatIcon?
 2018-06-03 16:22:09 -05:00
LetterJay
5cb9495b84 Merge pull request #7000 from Citadel-Station-13/upstream-merge-38246 
[MIRROR] Fixed hydroponics tray weed light not turning off when weeds are removed by an integrated circuits device.
 2018-06-03 16:21:53 -05:00
LetterJay
2c6c5bc5d2 Merge pull request #6998 from Citadel-Station-13/upstream-merge-38249 
[MIRROR] Fixes comms consoles thinking the transit is on centcom
 2018-06-03 16:21:19 -05:00
LetterJay
a3167c00fa Merge pull request #6993 from Citadel-Station-13/upstream-merge-38215 
[MIRROR] Fixes datediff not returning
 2018-06-03 16:20:12 -05:00
LetterJay
8bc642c6bd Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220 
[MIRROR] Fixes pocket items being deleted when monkeyizing
 2018-06-03 16:19:36 -05:00
LetterJay
a8274810ab Merge pull request #6991 from Citadel-Station-13/upstream-merge-38218 
[MIRROR] Fixes cigar bugs
 2018-06-03 16:19:16 -05:00
Tad Hardesty
9f4f470607 Delay smoothing atoms that have not initialized yet (#38173) 2018-06-03 14:25:35 -05:00
vuonojenmustaturska
568dfa7f35 Include item overlays in attack animations (shows the proper color of screwdrivers etc) (#38225) 
* overlay attacks

* this works too

* fix trays too
 2018-06-03 13:25:19 -05:00
vuonojenmustaturska
f83dc08fa7 are we free? (#38228) 2018-06-03 13:21:03 -05:00
theo2003
805852e1df Fixed hydroponics tray weed light not turning off when weeds are removed by an integrated circuits device. (#38246) 2018-06-03 12:59:27 -05:00
vuonojenmustaturska
83cf30c92e oh ho (#38249) 2018-06-03 11:45:43 -05:00
LetterJay
ae3f3cd741 Merge pull request #6988 from Citadel-Station-13/upstream-merge-38230 
[MIRROR] Fixes tritium and plasma fires storing cached_results incorrectly
 2018-06-03 10:44:51 -05:00
LetterJay
73d1abed5c Merge pull request #6987 from Citadel-Station-13/upstream-merge-38199 
[MIRROR] fixes a locate and adds job checks to download objective
 2018-06-03 10:42:27 -05:00
LetterJay
7b7420dec6 Merge pull request #6986 from Citadel-Station-13/upstream-merge-38250 
[MIRROR] [s]Fixes bloodcult exploit
 2018-06-03 10:42:16 -05:00
LetterJay
2e1d2c9736 Merge pull request #6985 from Citadel-Station-13/upstream-merge-38213 
[MIRROR] Fix mecha mouse pointer issues
 2018-06-03 10:41:39 -05:00
Jordie
d8113dfc99 Fixes datediff not returning (#38215) 2018-06-03 09:04:16 -05:00
ShizCalev
67841c3f19 Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-03 09:04:08 -05:00
ShizCalev
b7ae796734 Fixes cigar bugs (#38218) 2018-06-03 09:03:59 -05:00
cyclowns
bd25d809c3 Fixes tritium and plasma fires storing cached_results incorrectly (#38230) 
* id -> "fire"

* testing remnant
 2018-06-03 09:03:33 -05:00
Nich
b38f42f989 Fixes a locate and adds job checks to download objective (#38199) 2018-06-03 09:03:23 -05:00
kevinz000
217dfc0d53 Fixes exploit (#38250) 2018-06-03 09:03:15 -05:00
Tad Hardesty
95bbfb29d1 Fix mecha mouse pointer issues (#38213) 
* Fix mecha mouse pointer issues

* Migrate ranged ability mouse pointers to new system
 2018-06-03 09:03:06 -05:00
KorPhaeron
4b38136d79 Only load Reebe during clock cult (#38156) 
* Only load clock cult during clock cult

* Return FALSE
 2018-06-03 09:02:55 -05:00
LetterJay
5bf3bd761d Merge pull request #6961 from Citadel-Station-13/upstream-merge-38175 
[MIRROR] Removes drone overlays and the associated code
 2018-06-02 07:45:00 -05:00
LetterJay
55720bd218 Merge pull request #6978 from Citadel-Station-13/upstream-merge-38170 
[MIRROR] Fixed the clockwork helmet not dropping to the ground when used by a non-clock cultist like the other clock armor pieces do.
 2018-06-02 07:32:31 -05:00
LetterJay
8d8db8d2fe Merge pull request #6977 from Citadel-Station-13/upstream-merge-38091 
[MIRROR] EMPs no longer pulse internal silicon wires
 2018-06-02 07:32:11 -05:00
LetterJay
3f85ba3724 Merge pull request #6976 from Citadel-Station-13/upstream-merge-38210 
[MIRROR] Fix reagents being lost when vomit piles combine
 2018-06-02 07:31:53 -05:00
LetterJay
652b973810 Merge pull request #6975 from Citadel-Station-13/upstream-merge-38161 
[MIRROR] Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo
 2018-06-02 07:31:01 -05:00
LetterJay
6c5283be9f Merge pull request #6974 from Citadel-Station-13/upstream-merge-38198 
[MIRROR] Blacklist projectile effects from chasms
 2018-06-02 07:29:38 -05:00
LetterJay
5646dd794b Merge pull request #6973 from Citadel-Station-13/upstream-merge-38180 
[MIRROR] Fix family heirloom being lost on cloning
 2018-06-02 07:29:17 -05:00
LetterJay
3af17b9f7c Merge pull request #6972 from Citadel-Station-13/upstream-merge-38185 
[MIRROR] Set cult floor effects to be on the floor plane
 2018-06-02 07:28:56 -05:00
LetterJay
91351e1f1f Merge pull request #6970 from Citadel-Station-13/upstream-merge-38172 
[MIRROR] allows changing the rank of players in the playerpanel
 2018-06-02 07:28:31 -05:00
LetterJay
321df15afd Merge pull request #6969 from Citadel-Station-13/upstream-merge-38195 
[MIRROR] Fix infinite soapstone uses exploit
 2018-06-02 07:28:08 -05:00
LetterJay
97a31c283b Merge pull request #6963 from Citadel-Station-13/upstream-merge-38158 
[MIRROR] Fix: Cyborgs can now use defibs with other modules equipped
 2018-06-02 07:23:42 -05:00
LetterJay
d751cb619a Merge pull request #6966 from Citadel-Station-13/upstream-merge-38191 
[MIRROR] Stock parts sorter now use get_parts_rating
 2018-06-02 07:22:21 -05:00
LetterJay
25dbeeac80 Merge pull request #6959 from Citadel-Station-13/upstream-merge-38164 
[MIRROR] Corrects bronze table's name
 2018-06-02 07:21:15 -05:00
LetterJay
eeb336e635 Merge pull request #6958 from Citadel-Station-13/upstream-merge-38159 
[MIRROR] Arrest diagonal movement when force-moved
 2018-06-02 07:20:42 -05:00
LetterJay
228a88e442 Merge pull request #6957 from Citadel-Station-13/upstream-merge-38160 
[MIRROR] Fix rank changing with legacy only rank loading
 2018-06-02 07:20:24 -05:00
LetterJay
d05e01e5a5 Merge pull request #6956 from Citadel-Station-13/upstream-merge-38201 
[MIRROR] [s] Remove datum/action/generic
 2018-06-02 07:20:04 -05:00
theo2003
d45724f12b Fixed the clockwork helmet so it drops to the ground when used by a non-clock cultist like the other clock armor does. 2018-06-01 10:20:40 -05:00
kevinz000
308a8f16b7 EMPs no longer pulse internal silicon wires 2018-06-01 10:19:28 -05:00
Jordan Brown
6060af1c49 Merge pull request #38210 from AutomaticFrenzy/patch/by-vomit-combined 
Fix reagents being lost when vomit piles combine
 2018-06-01 09:58:50 -05:00
JStheguy
a3a0a49b5d Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo (#38161) 
* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there

* updated vending machine, burger, and donut sprites

they've all been improved marginally

* edits roborger a bit more

"bun" is flatter, has an antenna that blinks in agony

* does sprite things to lighters and cigar cases

* darkened cigar case interiors

* tweaks lighter flames
 2018-06-01 09:53:33 -05:00
Jordan Brown
948a128a72 Merge pull request #38198 from AutomaticFrenzy/patch/chasm-beams 
Blacklist projectile effects from chasms
 2018-06-01 09:52:21 -05:00
Jordan Brown
f2124aa3cf Merge pull request #38180 from AutomaticFrenzy/patch/heirloom-clone 
Fix family heirloom being lost on cloning
 2018-06-01 09:51:08 -05:00
Jordan Brown
876e8ec713 Merge pull request #38185 from AutomaticFrenzy/patch/cult-floors 
Set cult floor effects to be on the floor plane
 2018-06-01 09:50:58 -05:00
Nich
3b6e5236bf allows changing the rank of players in the playerpanel (#38172) 
* allows changing the rank of players in the playerpanel

* Update permissionedit.dm

* Update permissionedit.dm
 2018-06-01 08:26:25 -05:00
Nich
6d56a629f7 Fix infinite soapstone uses exploit (#38195) 2018-06-01 08:13:54 -05:00