Commit Graph

9373 Commits

Author SHA1 Message Date
ZomgPonies
109c1d4dc9 Lowered delimbing prob by half 2015-05-04 02:52:08 -04:00
ZomgPonies
570fefea94 Should fix limb sprite issues 2015-05-04 02:38:28 -04:00
ZomgPonies
b9c83fd713 Merge pull request #929 from Fox-McCloud/fingersnap
Adds in Fingersnapping
2015-05-03 19:20:06 -04:00
ZomgPonies
fae4edda0f Merge pull request #930 from Fox-McCloud/ai-recall
Removes AI's Recall Shuttle Ability
2015-05-03 19:19:56 -04:00
ZomgPonies
1fe9bf4a43 Merge pull request #928 from FreeStylaLT/notparadise2
Engineering/Atmos beret changes
2015-05-03 18:48:01 -04:00
ZomgPonies
ebb452e121 Merge pull request #927 from Fox-McCloud/fall-balance
Broken/Removed Limbs Falling Balance
2015-05-03 18:46:01 -04:00
Fox-McCloud
7e5b7f9297 Merge pull request #933 from tigercat2000/ventcrawlfixe
Ventcrawling fixes
2015-05-03 16:14:41 -04:00
Fox-McCloud
10422a855d Merge pull request #922 from SirBloodBuske/master
Intercom construction and Deconstruction.
2015-05-03 14:32:53 -04:00
Tigercat2000
b14f7a429f Ventcrawling fixes
d3athrow/vgstation13#4251
tgstation/-tg-station#9296

 - Fixes moving between pipeline datums not updating pipe vision
 - Fixes login() not updating pipe vision
 - Removes hardcoded limit of entering through unary machinery-- does
   nothing *now*
 - Can see pipes in darkness as fullbright
 - More sanity checks
2015-05-03 09:19:27 -07:00
Tigercat2000
b66603a37c Prevent fat humans from eating xenomorphs
This commit prevents fat humans from eating xenomorphs, now that you can
grab xenomorphs properly.

This is not soviet russia, xenomorph eat you.
2015-05-03 08:28:28 -07:00
TheDZD
c216529dda Merge pull request #923 from tigercat2000/grabrefactor
Mob grab/eating refactor
2015-05-03 11:05:35 -04:00
TheDZD
407a235259 Merge pull request #911 from Fox-McCloud/acj
ACJ Buff
2015-05-03 11:04:53 -04:00
TheDZD
fbf95404b7 Merge pull request #919 from Fox-McCloud/asteroid-temps
Asteroid Temp Fix 2.0--LINDA Edition
2015-05-03 11:04:47 -04:00
Fox-McCloud
5aada8a9a3 Merge pull request #906 from Krausus/NicotineAddiction
Cigarette Fixes/Tweaks
2015-05-02 23:29:49 -04:00
SirBloodBuske
164ae8af83 Adding Recipe to Auto Lathe 2015-05-02 17:38:59 -07:00
Fox-McCloud
66e705a163 Removes AI's Recall Shuttle Ability 2015-05-02 19:35:31 -04:00
Fox-McCloud
758994d620 Adds in Fingersnapping 2015-05-02 18:50:58 -04:00
FreeStylaLT
c290b1471e Engineering berets changes
Adds in a REAL Engineering beret, renames the current one to "atmospherics
beret", they spawn in engineering and CE's lockers.
2015-05-03 01:41:42 +03:00
Fox-McCloud
4f32684c6b Broken/Removed Limbs Falling Balance 2015-05-02 17:23:35 -04:00
Fox-McCloud
b3fab4e161 Merge pull request #916 from tigercat2000/PMGI
Procedural Map Generator Improvements - tgstation/-tg-station#9252
2015-05-02 17:01:37 -04:00
Fox-McCloud
cd311ba414 Merge pull request #915 from veganzombeh/fix
Various fixes
2015-05-02 17:00:40 -04:00
Tigercat2000
e3b3daba49 Mob grab/eating refactor
This refactors the mob-eat-mob code and fixes a few bugs along the way.
- Bursting out of a stomach now has a 0.4 second delay between attacks,
  so the message cannot be spammed.

- The list of mobs that can eat other mobs has been refactored to be a
  subproc instead of a 255char~ list on one line.

- Mob grab uses #defines for the time it takes to eat something else,
  now.

- Fixed xenomorphs bugging out the grab system, and made sure that fat
  people can't actually eat them because of this.
2015-05-02 04:40:46 -07:00
Fox-McCloud
65a59d6b23 Merge pull request #909 from tigercat2000/Resist
Resist update to -tg- standards
2015-05-01 20:52:12 -04:00
Fox-McCloud
7733df9e6b Asteroid Temp Change 2015-05-01 17:03:37 -04:00
veganzombeh
79c084450a Various fixes 2015-05-01 17:54:30 +01:00
Remie Richards
7adb829d33 Fixes the nature generator verb failing to recognise CLUSTER_CHECK_NONE as a valid flag 2015-05-01 08:37:10 -07:00
Remie Richards
b2bba39a68 Fixes the scope of the 4 Continue statements to correctly end the turfPath and atomPath loops, Corrects define bitflags 2015-05-01 04:15:18 -07:00
Remie Richards
88faef42ea Adjusts some code to reduce the rapid increase of clustering accidentally somehow caused in this improvement PR
Conflicts:
	code/modules/procedural mapping/mapGeneratorModules/nature.dm
2015-05-01 04:14:53 -07:00
Remie Richards
0bcdcd037b Fixes atoms not spawning, Corrects defineCircularRange() to produce proper spheres when given differing Z coords. 2015-05-01 04:13:09 -07:00
Krausus
e5f0d0bb6a Changes nicotine pre-generation and fixes lacing 2015-05-01 01:41:19 -04:00
ZomgPonies
14d7d38945 Merge pull request #914 from Fox-McCloud/explosionfix
Explosion Damage Fix
2015-04-30 23:31:25 -04:00
Fox-McCloud
6be72f97b8 forgot 2015-04-30 23:11:42 -04:00
Fox-McCloud
22136555f6 Explosion Damage Fix 2015-04-30 23:06:46 -04:00
Tigercat2000
09c536f0d7 Remove ZAS stuff from game panel
I forgot to remove these with LINDA, whoopsiesses
2015-04-30 19:39:53 -07:00
Krausus
7651325497 Reverts nicotine addiction changes 2015-04-30 22:30:53 -04:00
Fox-McCloud
2b406e7d63 ACJ Buff 2015-04-30 21:53:05 -04:00
Remie Richards
baa758921b Made defineRegion() procs additive instead of overwriting, overwriting has been moved to a "replace" argument, adds undefineRegion() which makes the map list a new list. 2015-04-30 17:56:19 -07:00
Remie Richards
7a0a724d6c Fixes a bug where turf cluster checks checked for atoms instead of turfs, adds proc to define a circular region, CIRCLES! 2015-04-30 17:56:11 -07:00
TheDZD
92a7c44bad Merge pull request #902 from Fox-McCloud/rings
Adds in Rings
2015-04-30 19:22:58 -04:00
TheDZD
cdd8309827 Merge pull request #910 from Fox-McCloud/projectile-fix
Fixes Projectile Effects
2015-04-30 18:30:35 -04:00
Fox-McCloud
7b309778aa Fixes Projectile Effects 2015-04-30 17:56:53 -04:00
Tigercat2000
7c1edbe4fd Resist update to -tg- standards
This commit updates the /mob/living resist verb to -tg- standards. It is
no longer a giant mess of 1 single verb, it has been split into a central
verb with multiple sub-procs.

This is not a port of -tg-'s optimized resist code, it simply makes the
existing code a bit less terrible, and organized in sub procs like -tg-
2015-04-30 14:18:16 -07:00
ZomgPonies
37fa1108d4 Merge pull request #895 from tigercat2000/okayletstrysomethingslightlydifferent
LINDA
2015-04-30 13:18:48 -04:00
ZomgPonies
fd735cdfb5 Merge pull request #904 from Fox-McCloud/exploits
Exploit Fix
2015-04-30 12:16:56 -04:00
Krausus
54b979eb34 Adds nicotine addiction to smokables 2015-04-30 09:22:21 -04:00
Fox-McCloud
ec3bf7d5fd Exploit Fix 2015-04-29 23:15:03 -04:00
Tigercat2000
627c600b81 Restore CLF3 to standard level
Whoops. Forgot to reintegrate a fire_stacks multiplication when I
reintegrated mob fire.
2015-04-29 17:17:34 -07:00
Tigercat2000
dfc74ebde6 Modify fire_act to temperature_expose where needed
This commit changes a bunch of objects fire_act's to temperature_expose,
to allow for superhot gas to act like an actual hotspot. This behaviour is
consistant with -tg-.
2015-04-29 16:56:12 -07:00
Fox-McCloud
1b0ea1e226 Adds in Rings 2015-04-29 19:05:43 -04:00
Tigercat2000
43a09daddc Merge remote-tracking branch 'Fox/fixessssss' into okayletstrysomethingslightlydifferent
Conflicts:
	code/modules/reagents/reagent_containers/glass_containers.dm
	maps/cyberiad.dmm

Fawwkss wai ;-;
2015-04-29 15:31:21 -07:00