shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,263 Commits 5 Branches 0 Tags
e6830cfec36c75fb5d63e2a32796b293d52993ce
Commit Graph

4441 Commits

Author SHA1 Message Date
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
365adf852c Merge branch 'master' into upstream-merge-31222 2017-10-04 21:50:07 -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
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
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
LetterJay
4959746caf Merge pull request #3113 from Citadel-Station-13/upstream-merge-31237 
[MIRROR] Server tools API update to 3.1.0.1
 2017-10-04 12:27:53 -04:00
Jordan Brown
cbf7ff0fc7 Dummies used for preference setup always compile overlays (#31267) 2017-10-04 11:03:47 -05:00
ExcessiveUseOfCobblestone
fe5b45dfeb Fixes Carpsie nullrod from being invisible (#31268) 2017-10-04 11:00:34 -05:00
Leo
c03513b65d Merge pull request #31256 from ShizCalev/zombie-toxin 
Zombies regen toxin damage
 2017-10-04 06:14:57 -05:00
Leo
951c9d04f2 Merge pull request #31261 from AnturK/lockedslot 
Fixes species locked slots alpha.
 2017-10-04 06:12:46 -05:00
vuonojenmustaturska
cdc7695741 Makes gutlunches hungry for gibs again (#31241) 
* gutlunch fix

* combine ifs, removes unneeded check
 2017-10-04 04:11:33 -05:00
LetterJay
0515d2b754 Merge pull request #3110 from Citadel-Station-13/upstream-merge-31034 
[MIRROR] Nightmare organs
 2017-10-04 02:14:22 -04:00
LetterJay
719b433ede Merge pull request #3108 from Citadel-Station-13/upstream-merge-31179 
[MIRROR] Adds the advanced medical scanner, gives one to the CMO
 2017-10-04 02:14:07 -04:00
LetterJay
05d9c9d3a2 Merge pull request #3104 from Citadel-Station-13/upstream-merge-31181 
[MIRROR] Blobs now take damage from particle accelerators
 2017-10-04 02:13:35 -04:00
John
315967bd15 Rebalanced pod people so they arnt as weak. 
This will allow podpeople to regen at a steady pace without them being able to take tool boxes to the head like candy. it takes around 15 seconds to notably heal compared to the 40 it does just for a little bit and the 3 from before it was nerfed. The fact that podpeople need to go to the medbay to fix burn damage made me decide to make their brute regen stronger, not to mention that a single welder smach gives 18.75 damage and a shot to the leg with a laser carbine does 25 burn damage.
 2017-10-03 23:10:50 -05:00
LetterJay
0830e6907e Merge pull request #3093 from Kevak/Shock-Collars 
Shock Collars Are Now A Thing.
 2017-10-03 20:16:10 -04:00
LetterJay
454fb160a8 Merge pull request #3112 from Citadel-Station-13/upstream-merge-31188 
[MIRROR] Gives nightmares a random shadowling name
 2017-10-03 20:15:31 -04:00
LetterJay
1c199d426b Merge branch 'master' into upstream-merge-31034 2017-10-03 20:15:07 -04:00
LetterJay
d483932395 Merge pull request #3109 from Citadel-Station-13/upstream-merge-31232 
[MIRROR] Fixes mech fab runtime
 2017-10-03 20:13:06 -04:00
LetterJay
3e975eca09 Merge pull request #3107 from Citadel-Station-13/upstream-merge-31135 
[MIRROR] Adds a var to minds that makes them immune to conversion
 2017-10-03 20:12:43 -04:00