Commit Graph

9338 Commits

Author SHA1 Message Date
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
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
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
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
Fox-McCloud
c1826deeda Various Fixes 2015-04-29 18:12:24 -04:00
Tigercat2000
38ab273dda Fix up reagent bombs, remove carbon fire_act
Carbon mobs do not actually need a fire_act, all it was doing was breaking
things with hardsuits. Reagent bombs are supposed to have a unique proc
instead of fire_act, so fixed.
2015-04-29 14:42:57 -07:00
Tigercat2000
173bdc4c27 Mob life fix, firedoors
This commit does the following;
 - Repairs mob breathing by adding a new ticker process, mob_master, as
   air_master is an unreliable ticker with it's customizable speed
 - Restore firedoor attack_hand access
  - You can now open and close firedoors by using no item, provided you
    have access to them and they aren't locked.
2015-04-29 12:47:23 -07:00
Krausus
4915d7067e Fixes setting default language through Check Known Languages
Also removes some non-functional code from the previous "fix".
2015-04-29 09:01:44 -04:00
Krausus
5e9e2cbd16 Fixes Cyborg Analyzer not showing destroyed components 2015-04-29 08:09:30 -04:00
Krausus
e9e4cda991 Fixes "An Unknown Servent" Typo 2015-04-29 07:59:17 -04:00
Krausus
57cd8f69c7 Fixes Colorful Reagent coloring non-simple mobs 2015-04-29 07:52:56 -04:00
Krausus
fc9607d17b Fixes Portable Chem Dispenser recharge delay
Now calculates properly, and matches up with the recently-reduced
recharge delay of the full-size dispensers
2015-04-29 07:38:26 -04:00
Tigercat2000
6e0bfbbbfa Merge remote-tracking branch 'upstream/master' into okayletstrysomethingslightlydifferent
Conflicts:
	maps/cyberiad.dmm
2015-04-28 14:26:43 -07:00
Tigercat2000
62657448d4 Reintegrate mob fire
I took out the entire on_fire system to work on LINDA. This commit readds
it.
2015-04-28 13:57:58 -07:00
Tigercat2000
9b7b4ae656 Apply most/all of LINDA's updates
This commit ports most, if not all of LINDA's updates on -tg-, and fixes a
few bugs that appear to be unique to paradise's codebase.
2015-04-28 12:45:58 -07:00
Tigercat2000
4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
Fox-McCloud
837538ce95 Reverts a Few Chem Changes 2015-04-27 17:41:13 -04:00
Fox-McCloud
f620fab569 [Goonchem] Fixes 2015-04-27 13:50:50 -04:00
ZomgPonies
50cabacb29 Merge pull request #886 from veganzombeh/vampire
Prevents vampires getting fat by drinking too much blood.
2015-04-27 11:08:02 -04:00
Fox-McCloud
5cf111c7ca Merge pull request #884 from tigercat2000/poniesfixes
Refactor pony code
2015-04-26 17:26:53 -04:00
ZomgPonies
58b0497569 Merge pull request #887 from Fox-McCloud/shirtfix
Fixes Shirts+Underwear---Adds Dressers
2015-04-26 10:08:36 -04:00
ZomgPonies
100789f6ec Merge pull request #877 from Fox-McCloud/beakerbomb
[Goonchem] Beaker Bombs
2015-04-26 10:07:46 -04:00
ZomgPonies
0342e4306c Merge pull request #870 from veganzombeh/digitalcamera
Adds digital camera to the protolathe construction menu.
2015-04-26 10:07:31 -04:00
veganzombeh
cf1ac2f602 Fixes #881 and lets vampires gain nutrition from consuming blood reagent.
Fixes #881, vampires should no longer get fat from drinking too much blood. Handle_blood now checks for blood that isn't their own and "eats" it.
2015-04-26 11:33:05 +01:00
veganzombeh
85ca01350f Adds a ditigal camera to the protolathe construction menu.
The digital camera allows you to save up to 10 photos, and print or delete them whever you want. It still requires film to print photos.
2015-04-26 10:07:08 +01:00
Fox-McCloud
fc05bea682 Fixes Shirts+Underwear---Adds Dresses 2015-04-25 23:44:19 -04:00
Fox-McCloud
fb579b0d19 assembly fixes 2015-04-25 22:43:40 -04:00
ZomgPonies
43e6e900fb Merge pull request #882 from CrAzYPiLoT-SS13/master
Language fix + Corgi health status fix
2015-04-25 17:50:05 -04:00
ZomgPonies
2ea39812e7 Merge pull request #847 from TheDZD/420yolotest
Removes Changeling Bloodtest
2015-04-25 17:48:53 -04:00
ZomgPonies
013e7cfcdd Merge pull request #874 from Fox-McCloud/chem-messages
[Goonchem] No Mix Messages
2015-04-25 17:45:31 -04:00
Tigercat2000
d0702db369 Refactor pony code
This refactors the simple_animal/pony code to use absolute paths and be
less shitty in general
2015-04-25 13:58:07 -07:00
Matt
a59f797752 Addition
What it says on the tin.
2015-04-25 22:46:12 +02:00
TheDZD
86ef9115dd Merge pull request #880 from Fox-McCloud/asteroid-fix
Asteroid Temp Fix
2015-04-25 15:53:02 -04:00
Matt
bbe0c08fe8 Language fix
Fixes https://github.com/ParadiseSS13/Paradise/issues/845
This now works. Simple as that.
2015-04-25 21:45:53 +02:00
Fox-McCloud
b5fe239c24 Asteroid Temp Fix 2015-04-25 15:36:21 -04:00
TheDZD
71b4e9e719 Merge pull request #871 from Fox-McCloud/goregib
More Gore from Gibbing
2015-04-25 15:28:49 -04:00
TheDZD
3f1726fbb8 Merge pull request #867 from Fox-McCloud/smoke
[Goonchem] Smoke Tweaks
2015-04-25 15:28:40 -04:00
Tigercat2000
735bfdf012 Fixes cmd_ghost_drag perms
This fixes the cmd_ghost_drag perms to work as they were originally
intended to- requiring either varedit OR r_admin + r_debug. The original
checks were exclusive, as it checked for no r_varedit OR no r_admin +
r_debug, which means that unless the user had all three, it would always
fail.
2015-04-25 08:08:58 -07:00
Fox-McCloud
c226067277 [Goonchem] Beaker Bombs 2015-04-25 05:28:56 -04:00