Commit Graph
5304 Commits
Author SHA1 Message Date
Erthilo 6fed058680 Fixes Tajarans and all mutant races spawning with no hair, etc. Partially fixes morph mutation. Fixes mutations. 2012-08-18 18:25:23 +01:00
Erthilo 7da0507c8a Hotfix for mice being able to use MouseDrop, fixing mice stripping people, donut boxes, etc. Also allows mice/parrots/kobolds/cats to die from low air or heat/cold. 2012-08-18 17:08:53 +01:00
Mloc 78a507b752 Merge pull request #1640 from caelaislinn/master
fix for hearing through walls >.>
2012-08-17 11:39:28 -07:00
Cael_Aislinn aa43ad116c fix for hearing through walls
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-18 04:38:15 +10:00
Mloc 43def17087 Merge pull request #1623 from caelaislinn/master
misc
2012-08-17 06:55:37 -07:00
CubeJackal 66f0fab77e Set icon for dart shells to new sprite 2012-08-17 05:22:59 +01:00
Cael_Aislinn a7cd8f6361 added a depth limit (default of 3) to recursive_mob_check, may be a slight optimisation
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-16 13:27:53 +10:00
Cael_Aislinn 692daf2762 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-08-15 18:50:56 +10:00
Cael_Aislinn 449f8dcea3 upgraded get_mobs_in_view() with tg's current version, significant optimisation
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-15 18:50:40 +10:00
SkyMarshal 175661aae5 Another attempt to fix the crashes, this time by switching to old radiocode! 2012-08-14 17:51:27 -07:00
SkyMarshal 0cca49a92f Should fix singularity maybe crashing from eating signs. 2012-08-14 16:40:21 -07:00
SkyMarshal d01c2331c7 Fix for ZAS being derped. 2012-08-14 16:25:17 -07:00
SkyMarshal fe4d8dda78 EMERGENCY ZAS FIX 2012-08-14 11:34:59 -07:00
SkyMarshal 7ef9d9e454 Sanity check for FloodFill. 2012-08-13 18:49:04 -07:00
SkyMarshal 22eb284ddf Made ZAS play nice with being mapped right on map edge, and remade supermatter to work right on this code base. 2012-08-12 23:04:28 -07:00
SkyMarshal aea3eda738 Floodfill experimental improvement, lets hope it fixes crashes. 2012-08-12 20:20:50 -07:00
SkyMarshal 82ed4f809f Revert "Revert pull request #1605 and #1606 due to temperature bugs killing the crew" since that code did not touch any temperature things, or even any ZAS things and I got no answers even after asking for about 18 hours...
This reverts commit 5e2f4948d0.
2012-08-12 18:41:27 -07:00
CIB ab7c78f3f5 Merge pull request #1604 from comma/master
Metroid surgery fix
2012-08-12 03:57:27 -07:00
CIB fe00859989 Increased cyborg slots to two
According to http://baystation12.net/forums/viewtopic.php?f=5&t=5144&view=unread#unread, we could even go up to 3, but let's take it one step at a time.
2012-08-12 03:24:02 -07:00
Albert Iordache 5e2f4948d0 Revert pull request #1605 and #1606 due to temperature bugs killing the crew 2012-08-12 12:17:35 +03:00
Albert Iordache 3439b6a88f Merge pull request #1606 from SkyMarshal/master
Some small changes before I go to bed.
2012-08-12 01:06:03 -07:00
SkyMarshal 2ed777a53e Just committing my work before bed. 2012-08-12 01:00:40 -07:00
SkyMarshal b37ea52f4d Some code that ensures ladders and shit play nice with the modular Z-levels 2012-08-12 00:16:14 -07:00
headswe ad4be43ec0 Merge pull request #1605 from SkyMarshal/master
More ZAS fixes, some work on less-retarded code for 3D processing, can be toggled with a pre-processor #define
2012-08-11 23:55:08 -07:00
SkyMarshal 4b1f394b2b Made a whoopsie in the ladder code, now conforms to modular Z-levels.
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
2012-08-11 23:53:07 -07:00
SkyMarshal 0bee1cb6b5 Work on 3D stuff. 2012-08-11 23:40:28 -07:00
SkyMarshal 5140b4e906 ZAS fixes. 2012-08-11 21:22:34 -07:00
comma 49cdc1a13c Fixed metroid core surgery. 2012-08-12 02:39:57 +04:00
CIB 031677a515 Merge pull request #1601 from caelaislinn/master
various WIP xenoarch update, some runtime and crash fixes
2012-08-11 06:00:35 -07:00
CIB ac3e5b6b05 Merge pull request #1602 from SkyMarshal/master
ZAS bugfixes and improvements. Zones will now properly interact with any bordering unsimulated turfs, so Cael can now make his planetary map.
2012-08-11 05:54:26 -07:00
CIB 0d2c2d11df Fixes the space unbuildable bug, I hope 2012-08-11 05:45:36 -07:00
CIB e94a508e78 Fixed a runtime 2012-08-11 05:23:22 -07:00
Cael_Aislinn 7423ec7831 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-08-11 20:28:14 +10:00
Cael_Aislinn c5d598596e moved reagents and recipes purely used for xenoarch to a new file, forgot to commit some icons, tweaks to a bunch of xenoarch stuff
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 20:27:30 +10:00
Cael_Aislinn 782510645a tweaks to the bunsen burner, added a grinder (automated mortar and pestle)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 20:25:54 +10:00
Cael_Aislinn b72e96c08d modified chemical reactions to preserve reagent data across reagents, if it exists. also made possible reactions with multiple products
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 20:24:51 +10:00
SkyMarshal bccaea11c9 Some more minor improvements. 2012-08-11 01:05:14 -07:00
SkyMarshal bca7ff054e Made an oopsie somewhere. 2012-08-11 00:56:52 -07:00
SkyMarshal cf89bbed1b ZAS bugfixes and improvements. Zones will now properly interact with any bordering unsimulated turfs, so Cael can now make his planetary map. Some cleanup to the code, and added scaling and sanity to air movement so that stuff isn't pants on head retarded. 2012-08-11 00:50:19 -07:00
Cael_Aislinn f33ee15700 fixed up some singularity ignores
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 12:44:11 +10:00
CIB c375935846 Nerfed damage from touching light bulbs 2012-08-10 12:00:40 -07:00
Cael_Aislinn 6ded63b850 various potential runtime / crash fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 03:11:45 +10:00
Cael_Aislinn 626c782ff2 new xenoarchaeology tools, basic datum for xenoarch work (WIP stuff)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 02:37:01 +10:00
headswe 79412c9a75 Merge pull request #1588 from CIB/suit
Moved the captain's suit
2012-08-10 09:19:53 -07:00
headswe 8103abcd9f Merge pull request #1583 from CIB/cib
Full wound system rewrite - Tested and ready to merge
2012-08-10 09:18:28 -07:00
Cael_Aislinn c6cef3ea98 moved and tweaked the xenoarch finds a bit
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 02:17:07 +10:00
Cael_Aislinn 1bd9e86b84 added chemistry cooker (bunsen burner) and the capacity for recipes that require heating
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 02:16:04 +10:00
Mloc 5ac03a38d5 Merge pull request #1599 from caelaislinn/master
zas debugging
2012-08-09 19:12:41 -07:00
Cael_Aislinn 77d031b230 removed false positive, doubled zas debug sensitivity
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-10 12:11:21 +10:00
Mloc d92887ed42 Merge pull request #1598 from caelaislinn/master
zas debugging
2012-08-09 18:10:19 -07:00