Commit Graph

7747 Commits

Author SHA1 Message Date
Ispil
2a7aab1042 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-12 13:21:07 -07:00
Mloc
f18cf65d7d Merge pull request #1925 from AterIgnis/full_artefacts
Artefacts update
2012-11-12 12:18:54 -08:00
Mloc
45733901a3 Merge pull request #1923 from Ispil/master
Minor AI Ion Storm Law Changes
2012-11-12 12:18:22 -08:00
Mloc
75a40c33e5 Merge pull request #1909 from AterIgnis/airlock_update
Airlock update
2012-11-12 12:17:16 -08:00
Mloc
b067372880 Merge pull request #1922 from Kreastr/master
Fix for issue #1868.
2012-11-12 12:12:11 -08:00
Ispil
814a670572 Fix to issue #1887. 2012-11-12 12:29:55 -07:00
Ater Ignis
c293803f71 artifacts full list of effects enabled, contact based effect works on toucher, not artifact itself 2012-11-12 11:11:35 +04:00
Ispil
b579300a1e Simple AI Ion Storm Laws change, in accordance with http://baystation12.net/forums/viewtopic.php?f=5&t=5889&p=115166#p115166
The only things changed were things of which Mini agreed with removing or adding, without argument (the ones with all the yeps). Removes some of the more grief-prone laws, and adds one or two to replace.
2012-11-11 23:40:26 -07:00
Kreastr
2faf9c7a9c The groups exist, but the lists do not. 2012-11-12 02:41:12 +02:00
Kreastr
dc396ddb57 Fix for Issue 1868 2012-11-12 02:24:28 +02:00
MrYeti
78d7f9ee42 Added Graduation Lighter. Deleted my own custom item. 2012-11-11 18:00:12 -05:00
Mloc
ba3a9d37b2 Merge pull request #1916 from Kreastr/master
Setting proper gliding_size for mobs and objects.
2012-11-11 14:01:46 -08:00
SkyMarshal
f064da7f50 Some fixes to Detective Work. 2012-11-11 14:46:37 -07:00
SkyMarshal
ecdb9ab118 Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it. 2012-11-11 14:33:33 -07:00
cib
a14ea29df3 Replaced monkey with confusion effect.
Feature is new and don't want surprise monkeys.
2012-11-11 19:35:01 +01:00
cib
a79ca39838 Forgot a spawn in trigger_side_effects 2012-11-11 19:09:36 +01:00
cib
fb295ee0cf Balancing for genetics side-effects:
- The knockdown is now much shorter, meaning a geneticist may be able to give themselves the cure in time.
- Reduced radiation created from syringes, since there are other side-effects now.
2012-11-11 18:51:02 +01:00
cib
d62aa1425f Fixed a few more bugs with genetic side effects. 2012-11-11 18:41:40 +01:00
cib
de95f7e8cc Small bug fix for side effect list generation. 2012-11-11 18:23:44 +01:00
cib
eb49378575 Added genetic side effects. 2012-11-11 18:15:12 +01:00
Kreastr
9ddc1d02d9 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/mob_defines.dm
2012-11-11 16:43:28 +02:00
Kreastr
0fe02fcd27 More clean up 2012-11-11 14:39:22 +02:00
cib
2522d5e7f1 Fixed up autoinjectors and added health analyzer to regular first aid. 2012-11-11 11:45:24 +01:00
SkyMarshal
bb3f533fb1 Merge pull request #1912 from Ravensdale/master
AI custom sprites: Re-introducing three and adding in my own.
2012-11-10 21:54:42 -08:00
Ravensdale
8cc22cbb15 Adjusts AI code to bring back custom cores and makes it easier to add in more. 2012-11-10 21:42:30 -08:00
RawrTaicho
f97f887458 Annnnnnnd another custom item: http://baystation12.net/forums/viewtopic.php?f=33&t=5413 2012-11-11 00:13:43 +00:00
RawrTaicho
864dbe8a84 http://baystation12.net/forums/viewtopic.php?f=33&t=5837 2012-11-10 23:43:24 +00:00
Ater Ignis
cea430cc77 Adds high_volume vents
Can be used in place of airtank in station airlocks - vents don't depend on tank storage, and do pressure equalisation faster a bit
2012-11-11 03:30:03 +04:00
Ater Ignis
efe819ec7c Updated cycling airlocks
New controller can check secondary sensor (tag 'sensor_tag_int
') for current pressure inside of station.
2012-11-11 03:26:37 +04:00
RawrTaicho
fde3147c5c - http://baystation12.net/forums/viewtopic.php?f=33&t=5801 2012-11-10 22:57:09 +00:00
Mloc
4fd90875bc Merge pull request #1904 from RawrTaicho/master
Issue #1818 - Freeform Module Broken Again
2012-11-10 09:27:37 -08:00
Mloc
35132b3036 Merge pull request #1901 from AterIgnis/hud_intent_better
all-intents-intent-button
2012-11-10 08:58:39 -08:00
Connor Reynolds
2f5621fedb Issue #1818 - Freeform Module broken again
-Think- I fixed it. It shouldn't just stop the user after they enter the
law priority number now. Should work properly.
2012-11-10 16:53:39 +00:00
Ater Ignis
20bdba6c67 all-intents-intent-button
shows all possible intents on intent button and allows choosing needed one directly, without scrolling them all
2012-11-10 14:19:02 +04:00
Ater Ignis
8b71b7d106 updated DNA code to have more mutations 2012-11-10 14:12:25 +04:00
Mloc
6bfdbdd606 Merge pull request #1898 from SniperYeti/master
Security Belt Modifications (Added the stuff I missed)
2012-11-10 01:15:26 -08:00
SkyMarshal
1eb2ceb643 Removed the /TG/ "feature" which has explosions insta-gib dead people. THIS IS WHY I HATE THE MERGE. 2012-11-09 22:30:38 -07:00
MrYeti
9f16527552 Update code/game/objects/items/weapons/storage/belt.dm 2012-11-09 19:36:12 -05:00
MrYeti
ea1d27a6a2 Update code/game/objects/items/weapons/storage/belt.dm 2012-11-09 19:26:47 -05:00
Ater Ignis
af0593e07b Chemistry on child reagents and in mobs
Ethanol childs (most drinks in general) are treated as ethanol in reactions
Reactions are going inside mobs, but not make bubbling effect
2012-11-09 20:53:20 +04:00
Ater Ignis
116b17e2be internal explosions
if some explosive reaction occurs - it firstly tries to explode container, next the surroundings
if container is alive - it cuts half of explosion power, if it is dead in process - cut an half again
2012-11-09 20:24:44 +04:00
Hawk-v3
3cfb201846 Merge pull request #1839 from AterIgnis/ed209
ED209 not showing on remote-control chip of security PDA
2012-11-09 07:42:09 -08:00
Hawk-v3
a114c79aca Merge pull request #1894 from comma/master
Limb surgery
2012-11-09 06:52:49 -08:00
Hawk-v3
86f3622d1c Merge pull request #1893 from SniperYeti/master
Security Belt Modifications
2012-11-09 06:50:25 -08:00
Hawk-v3
c4c065dfba Merge pull request #1885 from caelaislinn/bs12_with_tgport
remaining map updates, plus misc
2012-11-09 06:49:39 -08:00
Chinsky
a2f4c91e4a Made limbs prepeared for replacement stop hurt. 2012-11-09 18:07:02 +04:00
Chinsky
18f56f4a38 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-09 14:32:49 +04:00
Chinsky
2bf2d11730 Merge branch 'limbsurgery' 2012-11-09 14:32:22 +04:00
Chinsky
5043147cfc Added prothesis instll surgery. 2012-11-09 13:22:55 +04:00
MrYeti
6a129ea312 Update code/game/objects/items/weapons/storage/belt.dm
Added tasers and stun baton to the security belt and now has 7 slots.
2012-11-08 22:31:32 -05:00