shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,398 Commits 5 Branches 0 Tags
bb028777cf32430f8d5361f3d440708a5fc88845
Commit Graph

5161 Commits

Author SHA1 Message Date
LetterJay
612f2eccc2 Merge pull request #3442 from Citadel-Station-13/upstream-merge-31757 
[MIRROR] Makes player-controlled minebots a target for ocular wardens
 2017-10-17 08:54:42 -04:00
LetterJay
af1f7ce8d0 Merge pull request #3441 from Citadel-Station-13/upstream-merge-31772 
[MIRROR] Add a safety check for usr in airlock shocking
 2017-10-17 08:54:33 -04:00
LetterJay
ad07c97ab5 Merge pull request #3440 from Citadel-Station-13/upstream-merge-31771 
[MIRROR] Fixes atmos machinery examine
 2017-10-17 08:54:24 -04:00
LetterJay
1c35ac46e6 Merge pull request #3439 from Citadel-Station-13/upstream-merge-31768 
[MIRROR] Trims ahelps
 2017-10-17 08:54:14 -04:00
LetterJay
52db4fc0df Merge pull request #3437 from Citadel-Station-13/upstream-merge-31744 
[MIRROR] Fixes godhand having no inhand sprite
 2017-10-17 08:53:37 -04:00
LetterJay
5ae1b16d6c Update airlock.dm 2017-10-16 20:52:19 -05:00
vuonojenmustaturska
4ef21cc841 Makes player-controlled minebots a target for ocular wardens (#31757) 
* Makes player-controlled minebots a target for ocular wardens

* popularity reorder
 2017-10-16 16:48:29 -05:00
Leo
416816cd5f Add a safety check for usr in airlock shocking 2017-10-16 16:48:21 -05:00
Leo
201cf2c66b Merge pull request #31771 from tgstation/Cyberboss-patch-5 
Fixes atmos machinery examine
 2017-10-16 16:48:13 -05:00
Leo
3857bfb2fc Merge pull request #31768 from AnturK/ahelptrim 
Trims ahelps
 2017-10-16 16:48:04 -05:00
LetterJay
cc96777b6b wrong filepath 2017-10-16 16:46:02 -05:00
LetterJay
1c807d8bb8 donation item 2017-10-16 16:45:33 -05:00
KorPhaeron
74c6e7e23f Fixes godhand having no inhand sprite (#31744) 
* Fixes godhand having no inhand

* Correct file paths
 2017-10-16 14:34:11 -05:00
LetterJay
f0bc5936b6 Merge pull request #3434 from Citadel-Station-13/upstream-merge-31759 
[MIRROR] Fixes apprentices in check antags/roundend list
 2017-10-16 14:12:49 -04:00
LetterJay
24631746d4 Merge pull request #3414 from Citadel-Station-13/upstream-merge-31707 
[MIRROR] Restores security bombsuit & white bombsuit
 2017-10-16 14:12:28 -04:00
AnturK
c85e760eac Fixes apprentices in check antags/roundend list 2017-10-16 12:46:20 -05:00
LetterJay
638290e121 Merge pull request #3433 from Citadel-Station-13/upstream-merge-31765 
[MIRROR] Fixed fancy boxes not showing proper content amount.
 2017-10-16 10:40:06 -04:00
LetterJay
a3396b8fd0 Merge pull request #3431 from Citadel-Station-13/upstream-merge-31747 
[MIRROR] Removes hardcoded "full bottle" icons from several pre-filled reagent bottles
 2017-10-16 10:39:59 -04:00
LetterJay
7feae419a1 Merge pull request #3421 from deathride58/consensualaphro 
Make Crocin and Hexacrocin require arousal to be on to have lewd effects
 2017-10-16 10:39:50 -04:00
LetterJay
568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599 
[MIRROR] Moves projectile processing to a subsystem
 2017-10-16 10:39:41 -04:00
LetterJay
0f5fcfb44e Merge pull request #3417 from Citadel-Station-13/upstream-merge-31642 
[MIRROR]  Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons
 2017-10-16 10:39:30 -04:00
LetterJay
8ae369bf77 Update bottle.dm 2017-10-16 07:54:02 -05:00
LetterJay
75a4f22143 Update update_icons.dm 2017-10-16 07:53:19 -05:00
LetterJay
6f35f66dca Update update_icons.dm 2017-10-16 07:24:08 -05:00
Jordan Brown
98fb887ccc Merge pull request #31765 from DaxDupont/fancythis 
Fixed fancy boxes not showing proper content amount.
 2017-10-16 07:15:04 -05:00
LetterJay
1a3745b1f5 Merge pull request #3429 from Citadel-Station-13/upstream-merge-31691 
[MIRROR] EI NATH! now causes a flash of light
 2017-10-16 07:29:31 -04:00
LetterJay
4b6ebe3fa3 Merge pull request #3428 from Citadel-Station-13/upstream-merge-31710 
[MIRROR] Removes mapping error bandaid
 2017-10-16 07:29:20 -04:00
LetterJay
3160051499 Merge pull request #3425 from Citadel-Station-13/upstream-merge-31735 
[MIRROR] Fixes emotes not checking the right turf (or any turf for that matter)
 2017-10-16 07:28:13 -04:00
LetterJay
e4d2609800 Merge pull request #3420 from Citadel-Station-13/upstream-merge-31665 
[MIRROR] Adds logging crew manifest to seperate file
 2017-10-16 07:28:03 -04:00
LetterJay
7824c58539 Merge pull request #3418 from Citadel-Station-13/upstream-merge-31728 
[MIRROR] Sunflower makeover, adds missing inhands sprites.
 2017-10-16 07:27:31 -04:00
LetterJay
399d84500c Merge pull request #3419 from Citadel-Station-13/upstream-merge-31139 
[MIRROR] Honkbots: The Clown's lil helpers.
 2017-10-16 07:27:15 -04:00
LetterJay
a5628fe332 Merge pull request #3423 from Citadel-Station-13/upstream-merge-31738 
[MIRROR] makes loaded templates call air_update_turf() on bordering turfs
 2017-10-16 07:25:52 -04:00
LetterJay
ec41bbc420 Merge pull request #3422 from Citadel-Station-13/upstream-merge-31733 
[MIRROR] closed turfs remove themselves from SSair.high_pressure_delta on change
 2017-10-16 07:25:44 -04:00
LetterJay
3c0c5db5d9 Update beam_rifle.dm 2017-10-16 06:14:24 -05:00
LetterJay
ee70d961d7 Update firing.dm 2017-10-16 06:13:51 -05:00
LetterJay
11769ef9f8 Update other_mobs.dm 2017-10-16 06:13:41 -05:00
LetterJay
8a14bab2ee Update update_icons.dm 2017-10-16 06:10:06 -05:00
LetterJay
a11a474a94 Merge pull request #3416 from Citadel-Station-13/upstream-merge-31698 
[MIRROR] Prevents tiles from being placed on top of buckled mobs
 2017-10-16 07:09:30 -04:00
LetterJay
5dd348564a Merge pull request #3415 from Citadel-Station-13/upstream-merge-31690 
[MIRROR] You can smash the bulbs in floodlights
 2017-10-16 07:09:17 -04:00
LetterJay
a703a599fa Merge pull request #3413 from Citadel-Station-13/upstream-merge-31695 
[MIRROR] Makes directional windows only block air if anchored
 2017-10-16 07:08:11 -04:00
LetterJay
74bc1be6c2 Merge pull request #3412 from Citadel-Station-13/upstream-merge-31705 
[MIRROR] Fixes tendril possession
 2017-10-16 07:08:02 -04:00
LetterJay
d5d0fa919a Merge pull request #3411 from Citadel-Station-13/upstream-merge-31714 
[MIRROR] Fixes "permenant" and "permenantly" typos in code/comments.
 2017-10-16 07:06:37 -04:00
LetterJay
029d98028a Merge pull request #3410 from Citadel-Station-13/upstream-merge-31713 
[MIRROR] Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
 2017-10-16 07:06:28 -04:00
vuonojenmustaturska
11eff73897 Removes hardcoded "full bottle" icons from several pre-filled reagent bottles 2017-10-16 00:00:52 -05:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
MoreRobustThanYou
1b7cd05752 EI NATH! now causes a flash of light (#31691) 
i've been reading too much harry potter
 2017-10-15 21:04:14 -05:00
Jordan Brown
baf8b578f5 Removes mapping error bandaid (#31710) 
* Removes mapping error bandaid

* Update conversion code
 2017-10-15 21:02:02 -05:00
Jordan Brown
814bf72d66 Fixes emotes not checking the right turf (or any turf for that matter) (#31735) 
* Fixes emotes not checking the right turf (or any turf for that matter)
 2017-10-15 19:41:01 -05:00
duncathan salt
fcab4e8a59 makes loaded templates call air_update_turf() on bordering turfs (#31738) 
* makes loaded templates call air_update_turf() on bordering turfs

* safety check for OOB turfs; fixes compile error
 2017-10-15 19:34:33 -05:00
duncathan salt
3da718d3b1 closed turfs remove themselves from SSair.high_pressure_delta on change (#31733) 2017-10-15 19:32:20 -05:00