Commit Graph

17074 Commits

Author SHA1 Message Date
Krausus
f6ad960f60 Allows synthetics to get reagents from cigarettes 2015-05-02 22:43:44 -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
SirBloodBuske
d47a39a05a Fixing Intercom changes from VG Code to Paradise 2015-05-02 16:14:36 -07: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
SirBloodBuske
b63d1d0163 Adding Intercom to recipes 2015-05-02 15:12:42 -07: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
SirBloodBuske
92789ec855 Revert "Revert "Intercom build/destroy""
This reverts commit 26ae8ac80e.
2015-05-02 00:19:34 -07:00
SirBloodBuske
26ae8ac80e Revert "Intercom build/destroy"
This reverts commit 3a2b2e906d.
2015-05-02 00:19:27 -07:00
SirBloodBuske
3a2b2e906d Intercom build/destroy 2015-05-02 00:19:14 -07:00
Krausus
21b92a80f9 Tweaks cigarette reagent depletion message 2015-05-01 22:46:53 -04:00
Tigercat2000
e598a4e40a Merge remote-tracking branch 'upstream/master' into ContextBasedGrab 2015-05-01 18:18:08 -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
Tigercat2000
26f1cd88d5 ONE DAY I WILL HAVE FIXED TOXINS MIXING
I left out a very important define from plasma windows that prevents them
from heating the room
2015-05-01 07:52:29 -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
73983dc433 Fixes putting cigars and pipes into cigarette packs 2015-05-01 04:28:18 -04: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
Krausus
d2588f64ec Fixes some code that was triggering Goofball 2015-04-30 23:12:28 -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
36f8d0a114 Add CanAtmosPass to shuttle windows
ohgodpleasetellmeIdidn'tmissanythingelse
2015-04-30 19:45:48 -07: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
Tigercat2000
4e4285dccf Fix plasma windows breaking due to temperature
So uh, I forgot to define fire_act AND temperature_act as returns for the
plasma windows, so the toxins chamber kept breaking open. Whoopsies.
2015-04-30 13:49:32 -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
96f2a087ad Re-adds passive nicotine comment
Thanks for eating my comment, git.
2015-04-30 09:26:14 -04:00
Krausus
54b979eb34 Adds nicotine addiction to smokables 2015-04-30 09:22:21 -04:00
Fox-McCloud
8f686aab46 Merge pull request #898 from SirBloodBuske/SirBloodBuske-Alarm-Deconstuct-Fix
Update alarm.dm
2015-04-30 03:09:34 -04:00
SirBloodBuske
797ec2377f Update alarm.dm 2015-04-29 23:52:09 -07:00
SirBloodBuske
ae79fce8e8 Update alarm.dm
Fix'd spans
2015-04-29 23:42:43 -07:00
Tigercat2000
b91d86abcd Makes RCD qdel doors
This still doesn't fix the turf-not-updating bug, but it does make the RCD
qdel doors.
2015-04-29 20:26:59 -07:00
Fox-McCloud
ec3bf7d5fd Exploit Fix 2015-04-29 23:15:03 -04:00