4416 Commits

Author	SHA1	Message	Date
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	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
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
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
LetterJay	84d98d5973	Merge pull request #3106 from Citadel-Station-13/upstream-merge-31208 ... [MIRROR] Makes mobs on fire light up	2017-10-03 20:12:24 -04:00
LetterJay	b5e0981d62	Merge pull request #3102 from Citadel-Station-13/upstream-merge-31250 ... [MIRROR] Greatly speeds up bees	2017-10-03 20:11:25 -04:00
LetterJay	c522e7a6e8	Merge pull request #3101 from Citadel-Station-13/upstream-merge-31236 ... [MIRROR] Monkey Cubes expanding will give the new monkey an attack log with their creator	2017-10-03 20:11:13 -04:00
LetterJay	8fd4ca0fe4	Merge pull request #3100 from Citadel-Station-13/upstream-merge-31252 ... [MIRROR] Partial revert of #30763 (datum config refactor)	2017-10-03 20:10:56 -04:00
LetterJay	a3cea89134	Merge pull request #3099 from Citadel-Station-13/upstream-merge-31228 ... [MIRROR] fixes healguardians not being able to heal people	2017-10-03 20:10:42 -04:00
LetterJay	befcfd1f06	Merge pull request #3095 from Citadel-Station-13/upstream-merge-31202 ... [MIRROR] Organ initialization cleanup	2017-10-03 20:10:08 -04:00
LetterJay	601ccec26f	Merge pull request #3098 from Citadel-Station-13/upstream-merge-31253 ... [MIRROR] Fixes morgue maintenance radstorm protection	2017-10-03 19:49:37 -04:00
LetterJay	b9967e6453	Update medical.dm	2017-10-03 18:48:43 -05:00
LetterJay	0206e3f775	Update particle.dm	2017-10-03 18:48:18 -05:00
oranges	2ec77d2d9b	Merge pull request #31237 from Cyberboss/STAPIUpdate ... Server tools API update to 3.1.0.1	2017-10-03 18:47:51 -05:00
LetterJay	dc9b438bd8	Update skeletons.dm	2017-10-03 18:47:01 -05:00
LetterJay	e4d6219f1d	Update brain_item.dm	2017-10-03 18:46:41 -05:00
Armhulen	65a73bcefa	Gives nightmares a random shadowling name (#31188) ... * fuck you ruined my !ONE COMMIT PR! * !ONE COMMIT PR!	2017-10-03 18:41:37 -05:00
KorPhaeron	037ea0ce13	Nightmare organs	2017-10-03 18:22:01 -05:00
AnturK	67f0c2f41c	Fixes mech fab runtime (#31232) ... * Dunno what the initial was about, it's a list. * Proper fixup * Typo	2017-10-03 18:19:40 -05:00
XDTM	1782fbeed7	Adds the advanced medical scanner, gives one to the CMO	2017-10-03 18:16:29 -05:00
oranges	5c49bab3c5	Merge pull request #31135 from KorPhaeron/unconvertable ... Adds a var to minds that makes them immune to conversion	2017-10-03 18:15:20 -05:00
oranges	baa53ba1d3	Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA ... Makes mobs on fire light up	2017-10-03 18:14:10 -05:00
Supermichael777	d69c6615a8	Fixes stealth nerf to detectives gun (#31125) ... * Fixes stealthnerf to detectives gun Having knockdown healed stamina damage, but also needed stamina too keep you down. This rectifies the extra stamina healing * WEW LADS	2017-10-03 18:14:01 -05:00
MoreRobustThanYou	f78d0988ab	Blobs now take damage from particle accelerators	2017-10-03 18:12:52 -05:00
vuonojenmustaturska	3310d73b7f	Greatly speeds up bees (#31250) ... * Bee perf * requested changes	2017-10-03 18:04:28 -05:00
ExcessiveUseOfCobblestone	126020185d	Monkey Cubes expanding will give the new monkey an attack log with their creator (#31236) ... * Update snacks_meat.dm * no one wants to see that * WE'RE JUST SENDING IT TO ONE PLACE COBBY * boop * cool leoz tricks * Update snacks_meat.dm	2017-10-03 17:56:14 -05:00