shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,117 Commits 5 Branches 0 Tags
bfdef7fcfd2f552bbeac08bf63d0d35fcea655cf
Commit Graph

30117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghom
bfdef7fcfd Merge pull request #10755 from kevinz000/attack_chain 
small refactor to melee_attack_chain
 2020-02-13 09:39:07 +01:00
CitadelStationBot
e5753b4fc0 Automatic changelog generation for PR #11026 [ci skip] 2020-02-13 02:36:13 -06:00
Ghom
380983bd10 Merge pull request #11026 from Trilbyspaceclone/patch-278 
Makes ninja and wizards no longer spawn with suit sensors
 2020-02-13 09:36:10 +01:00
CitadelStationBot
86667b4c1c Automatic changelog generation for PR #11024 [ci skip] 2020-02-13 02:28:38 -06:00
Ghom
721b647e3c Merge pull request #11024 from Citadel-Station-13/kevinz000-patch-5 
Fixes brig cell timers, alternatively "WHO DECIDED TO USE NUMBER OF SECONDS FROM 2000 INSTEAD OF FROM THE CURRENT DAY"
 2020-02-13 09:28:35 +01:00
Ghom
9d55e2d514 Merge pull request #11030 from InnocentFire/markings_notmammals.dmi-update 
Update to markings_notmammals.dmi
 2020-02-13 09:27:55 +01:00
deathride58
ac387e0655 Merge pull request #11059 from Citadel-Station-13/Ghommie-patch-1 
oh damn, forgot those are numbers
 2020-02-13 02:53:22 -05:00
Ghom
4f61f570ce Merge pull request #11058 from Citadel-Station-13/kevinz000-patch-16 
geiger counter gc fix
 2020-02-13 08:52:03 +01:00
Ghom
1fd8ebc2dc Update genitals.dm 2020-02-13 08:28:52 +01:00
Ghom
e4a20a16a4 Update genitals.dm 2020-02-13 08:25:44 +01:00
Ghom
1ef3f45f89 Update genitals.dm 2020-02-13 08:22:08 +01:00
Ghom
d9885cf278 oh damn, forgot those are numbers 2020-02-13 08:16:37 +01:00
kevinz000
40111faab1 Update geiger_counter.dm 2020-02-13 00:12:25 -07:00
CitadelStationBot
358fe3d2e0 Automatic changelog generation for PR #10943 [ci skip] 2020-02-13 01:05:04 -06:00
kevinz000
79f253e042 Merge pull request #10943 from Ghommie/Ghommie-cit562 
Fixing an oversight with genital/Remove() and cleaning the code a little.
 2020-02-13 00:05:01 -07:00
Ghom
ee10c03630 Merge branch 'master' into Ghommie-cit562 2020-02-13 08:00:53 +01:00
CitadelStationBot
f0f043db49 Automatic changelog generation for PR #11012 [ci skip] 2020-02-13 00:58:16 -06:00
kevinz000
c790478a3d Merge pull request #11012 from keronshb/RatvarDrink 
Introduces the Ratvarian mixed drink, the CogChamp!
 2020-02-12 23:58:14 -07:00
CitadelStationBot
ed6c35f170 Automatic changelog generation for PR #11005 [ci skip] 2020-02-13 00:57:53 -06:00
kevinz000
5b01691834 Merge pull request #11005 from Arturlang/Hypospray_fix 
Moves the hypospray mode change to CTRL click
 2020-02-12 23:57:50 -07:00
CitadelStationBot
ca7134ca92 Automatic changelog generation for PR #10987 [ci skip] 2020-02-13 00:56:55 -06:00
kevinz000
4e419eed03 Merge pull request #10987 from Ghommie/Ghommie-cit567 
Something about missing privates sprites and bad code.
 2020-02-12 23:56:53 -07:00
CitadelStationBot
b682f9e730 Automatic changelog generation for PR #11029 [ci skip] 2020-02-12 22:01:10 -06:00
kevinz000
4f9652f2d2 Merge pull request #11029 from Putnam3145/fix-that-dumb 
Made the fallback if config is incorrect for map voting plurality (default)
 2020-02-12 21:01:07 -07:00
Trilbyspaceclone
b7c3582d86 Update outfit.dm 2020-02-12 14:29:19 -05:00
Trilbyspaceclone
551a2593d4 Update color.dm 2020-02-12 14:28:57 -05:00
CitadelStationBot
89936a1335 Automatic changelog generation for PR #10994 [ci skip] 2020-02-12 09:51:41 -06:00
Ghom
942f3f28be Merge pull request #10994 from DeltaFire15/narsierunefix 
Mom said its my time to scribe Nar'Sie (Alternatively: Nar'Sie runes no longer take half the time (or even less) to scribe on runed floor)
 2020-02-12 16:51:38 +01:00
CitadelStationBot
f89d3907e9 Automatic changelog generation for PR #11043 [ci skip] 2020-02-12 08:35:05 -06:00
Ghom
2674fa6efc Merge pull request #11043 from Seris02/apcthingfix 
fixes apc icons
 2020-02-12 15:35:01 +01:00
Seris02
eb5835f668 fixes apcs 2020-02-12 21:35:51 +08:00
CitadelStationBot
88f063623e Automatic changelog generation for PR #11020 [ci skip] 2020-02-12 05:47:35 -06:00
Ghom
31c7a0e2be Merge pull request #11020 from Zellular/Animations1 
Movement animations for the pupdozer
 2020-02-12 12:47:32 +01:00
CitadelStationBot
a7e24c33c2 Automatic changelog generation for PR #11018 [ci skip] 2020-02-12 04:14:30 -06:00
Ghom
8c2801fda6 Merge pull request #11018 from Citadel-Station-13/kevinz000-patch-4 
EMPs now function as intended and mute pAIs for 3 minutes, not 60 minutes.
 2020-02-12 11:14:27 +01:00
CitadelStationBot
40ab7b45df Automatic changelog generation for PR #10992 [ci skip] 2020-02-12 03:34:28 -06:00
Ghom
af477aa28b Merge pull request #10992 from Hatterhat/buckbuff 
buckshot buff - 60 to 75 on all pellet pointblank
 2020-02-12 10:34:25 +01:00
Ghom
0917617543 Merge pull request #11004 from Citadel-Station-13/kevinz000-patch-2 
improves getImplant by using locate()
 2020-02-12 10:33:08 +01:00
Ghom
ce5208a1df Merge pull request #11007 from r4d6/random-fixes 
Mining Shuttle Fix
 2020-02-12 10:10:16 +01:00
CitadelStationBot
9997cb4f75 Automatic changelog generation for PR #11032 [ci skip] 2020-02-12 02:09:39 -06:00
Ghom
fc3f0d02fc Merge pull request #11032 from Citadel-Station-13/kevinz000-patch-7 
Fixes cryotubes not transferring reagents for minutes at a time (because at tier 4 it takes 80 * 20 = 1600 deciseconds (!!!) to .. transfer regeants??)
 2020-02-12 09:09:36 +01:00
CitadelStationBot
199df8bec0 Automatic changelog generation for PR #10861 [ci skip] 2020-02-12 02:06:06 -06:00
Ghom
2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port 
Ports /vg/station drink sliding
 2020-02-12 09:06:03 +01:00
InnocentFire
d1dc2edde3 Update to markings_notmammals.dmi 
Changes Plain_r_arm, Plain_l_arm, Plain_r_hand and Plain_l_hand to remove the dark spots, since apparently this has the same dark markings as the last one.
 2020-02-12 02:54:23 -05:00
kevinz000
ecbb7767c3 Update cryo.dm 2020-02-11 23:07:47 -07:00
InnocentFire
6739b0946d Update markings_notmammals.dmi 
Changes:
none_r_arm, none_l_arm, none_r_hand, and none_l_hand in the "Markings_notmammals.dmi to make them not have random dark markings on the body.
 2020-02-11 19:16:09 -05:00
Putnam
7795e1609d why did i do that 2020-02-11 15:32:43 -08:00
Trilbyspaceclone
1b06506209 Update color.dm 2020-02-11 15:54:37 -05:00
Trilbyspaceclone
a8778417e4 Update standard.dm 2020-02-11 15:52:41 -05:00
Trilbyspaceclone
be58994538 Update outfit.dm 2020-02-11 15:43:17 -05:00