shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,934 Commits 5 Branches 0 Tags
d2b73ea31800a4dd25bcdfdf44804df236d90ee6
Commit Graph

7875 Commits

Author SHA1 Message Date
JJRcop 4ecc019353 Moved admin music volume slider to its own menu (#31277) 
* Moved admin music volume slider to its own menu

* Minor fixes to goonchat
 2017-10-05 02:59:52 -05:00
Emmett Gaines d50c0e10f6 Makes shuttle movement a bit smoother and faster 2017-10-05 02:31:10 -05:00
RandomMarine fb7a0d7606 Experimental fix for bloom issue (#31299) 2017-10-04 23:25:06 -05:00
LetterJay e6830cfec3 Merge pull request #3103 from Citadel-Station-13/upstream-merge-31222 
[MIRROR] Ports dash weapons to the dash datum
 2017-10-04 23:01:59 -04:00
LetterJay c2d8f048f8 Update cult_items.dm 2017-10-04 21:49:46 -05:00
LetterJay 7c4373c1fe Update cult_items.dm 2017-10-04 21:15:11 -05:00
LetterJay f57929b26c Update book.dm 2017-10-04 21:14:25 -05:00
LetterJay d4cd519730 Merge pull request #3123 from Citadel-Station-13/upstream-merge-31276 
[MIRROR] Moves laughter to the emote
 2017-10-04 22:01:49 -04:00
LetterJay 09f6eb6156 Update preferences_savefile.dm 2017-10-04 20:53:42 -05:00
LetterJay 4c38a8b1e2 Update energy_katana.dm 2017-10-04 20:51:37 -05:00
LetterJay 365adf852c Merge branch 'master' into upstream-merge-31222 2017-10-04 21:50:07 -04:00
Supermichael777 63aa1c7153 Makes the pda font a prefernce 2017-10-04 19:28:57 -05:00
Leo c873c17478 Merge pull request #31284 from tgstation/Cyberboss-patch-1 
Code cleanup in snack_meats.dm
 2017-10-04 19:27:47 -05:00
Leo 39cf9bb7a0 Merge pull request #31286 from KorPhaeron/ismachinery 
ismachinery define
 2017-10-04 19:26:38 -05:00
Leo dec28eabfc Merge pull request #31287 from ShizCalev/wizard-name 
Correctly applies wizard names
 2017-10-04 19:26:31 -05:00
Leo e5f5b427ba Makes the energy katana swwwwwwish when drawn 2017-10-04 19:25:21 -05:00
deathride58 b37556a951 makes responsibility objective a little more clear 2017-10-04 20:19:43 -04:00
deathride58 5692228379 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:41 -04:00
deathride58 5cefa71992 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:03 -04:00
LetterJay 13cf0696e0 Merge branch 'master' into upstream-merge-31198 2017-10-04 19:06:42 -04:00
LetterJay 1a70aa0227 Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887 
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
 2017-10-04 19:06:02 -04:00
oranges 42c59b67b5 Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed 2017-10-04 17:55:39 -05:00
LetterJay 3fdc29ba42 Merge pull request #3134 from Citadel-Station-13/upstream-merge-31283 
[MIRROR] Fixes shaking people up while buckled into a bed/resin nest
 2017-10-04 18:45:09 -04:00
LetterJay 9ee8b6298f Merge pull request #3133 from Citadel-Station-13/upstream-merge-31275 
[MIRROR] Adds deconstruction hints to various things
 2017-10-04 18:44:50 -04:00
LetterJay c2fe00cebd Merge pull request #3132 from Citadel-Station-13/upstream-merge-31264 
[MIRROR] Preliminary blast cannon cleanup
 2017-10-04 18:44:38 -04:00
LetterJay ecf44ff651 Merge pull request #3131 from Citadel-Station-13/upstream-merge-31150 
[MIRROR] Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower
 2017-10-04 18:44:21 -04:00
LetterJay b217a804b6 Merge pull request #3130 from Citadel-Station-13/upstream-merge-31238 
[MIRROR] Space vision fix V2.0 - GAME_PLANE change
 2017-10-04 18:44:08 -04:00
LetterJay aa91d6193b Merge pull request #3129 from Citadel-Station-13/upstream-merge-31254 
[MIRROR] Hosts can lock config options from admins
 2017-10-04 18:43:55 -04:00
LetterJay 4610a7a61d Merge pull request #3128 from Citadel-Station-13/upstream-merge-31180 
[MIRROR] removes carp piggyback exploit
 2017-10-04 18:43:31 -04:00
LetterJay e6ccc7077a Merge pull request #3126 from Citadel-Station-13/upstream-merge-31279 
[MIRROR] why plus a minus value and not just minus the value...
 2017-10-04 18:43:04 -04:00
LetterJay cfd98caf98 Update emote.dm 2017-10-04 17:42:38 -05:00
LetterJay 8c77408bb1 Merge pull request #3114 from Daniel0Mclovin/patch-2 
Rebalanced pod people so they arnt as weak.
 2017-10-04 18:42:02 -04:00
LetterJay 944c749dfc Merge pull request #3117 from Citadel-Station-13/upstream-merge-31256 
[MIRROR] Zombies regen toxin damage
 2017-10-04 18:41:45 -04:00
LetterJay 6fe3f2a6b9 Merge pull request #3105 from Citadel-Station-13/upstream-merge-31125 
[MIRROR] Fixes stealth nerf to detectives gun
 2017-10-04 18:40:56 -04:00
LetterJay b2184c1a78 Update cult_structures.dm 2017-10-04 17:38:01 -05:00
ShizCalev 929c737dfe Fixes shaking people up while buckled into a bed/resin nest (#31283) 
* Fixes shaking people up when buckled into bed

* CB
 2017-10-04 17:01:27 -05:00
oranges 25cf971fef Merge pull request #31275 from kingofkosmos/moredeconhints 
Adds deconstruction hints to various things
 2017-10-04 16:33:51 -05:00
kevinz000 d9d08ed57f Preliminary blast cannon cleanup (#31264) 
* Update blastcannon.dm

* Update blastcannon.dm

* Update blastcannon.dm
 2017-10-04 16:32:41 -05:00
ShizCalev 4d23dd56b8 Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower (#31150) 
* Hides ninja socks, draining updated to DisplayPower

* CB

* KEEP_TOGETHER
 2017-10-04 16:29:30 -05:00
LetterJay 77c422d011 Update emote.dm 2017-10-04 16:11:24 -05:00
oranges c22f4a044d Merge pull request #31238 from AnturK/specialeyes 
Space vision fix V2.0 - GAME_PLANE change
 2017-10-04 15:14:07 -05:00
JJRcop 65a997f929 Hosts can lock config options from admins (#31254) 
* Hosts can lock config options from admins

* Optimization of LoadEntries

a very very very small one
 2017-10-04 14:59:33 -05:00
kevinz000 9e59a29e35 Update projectile.dm (#31180) 2017-10-04 14:51:16 -05:00
kevinz000 1a3fc9f1c6 why plus a minus value and not just minus the value... (#31279) 
* Update bullets.dm

* Update visuals_icons.dm

* Update asteroid.dm
 2017-10-04 14:03:20 -05:00
Jordan Brown 441514937e Moves laughter to the emote 2017-10-04 12:20:23 -05:00
bawhoppen 460fea66c8 Moves all stack object sprites from items_and_weapons.dmi to their own file 2017-10-04 11:59:53 -05:00
LetterJay 282dcb3c16 Merge pull request #3121 from Citadel-Station-13/upstream-merge-31267 
[MIRROR] Dummies used for preference setup always immediately compile their overlays
 2017-10-04 12:29:21 -04:00
LetterJay 6fec59e75b Merge pull request #3120 from Citadel-Station-13/upstream-merge-31268 
[MIRROR] Hotfix: Fixes Carpsie nullrod from being invisible
 2017-10-04 12:28:59 -04:00
LetterJay c08ff0dead Merge pull request #3116 from Citadel-Station-13/upstream-merge-31261 
[MIRROR] Fixes species locked slots alpha.
 2017-10-04 12:28:25 -04:00
LetterJay d8d75099e5 Merge pull request #3115 from Citadel-Station-13/upstream-merge-31241 
[MIRROR] Makes gutlunches hungry for gibs again
 2017-10-04 12:28:14 -04:00