Hawk-v3
2197fd6cbc
Merge pull request #2000 from Whitellama/master
...
Map Fixes
2012-11-23 17:52:27 -08:00
Whitellama
5f1552d35e
Turned off space ninja spawning as a minievent
2012-11-23 14:59:18 -08:00
Chinsky
7150999fc6
Rolling pins now work not inly only in full moon at the odd day of week between 1 and 3 am if stars are right.
...
Fixes issue #1980
2012-11-21 22:29:46 +04:00
Chinsky
15abc757d3
Nullchecks. And one zero division.
2012-11-21 20:55:53 +04:00
SkyMarshal
0644ac9af0
Merge pull request #1974 from CIB/master
...
Medical fixes and balancing
2012-11-19 11:19:10 -08:00
cib
c5d35839ba
Fixes issue #1959
...
Crew transfer shuttles now force the mode to finish, even if the mode has other finish conditions.
2012-11-19 12:24:14 +01:00
SkyMarshal
ae3cd42c76
Merge pull request #1973 from comma/master
...
Runtimes
2012-11-18 17:07:39 -08:00
Ispil
d6505fd064
Fix to Issue #1972 . Humans now spawn with full SE length, as do monkeys.
2012-11-18 15:40:55 -07:00
cib
3a3f2ff4a1
Medical scanner additions.
...
- Stationary scanners detect vira.
- Portable scanners detect internal bleeding.
2012-11-18 16:38:29 +01:00
Chinsky
56c20b7fb3
Fixed couple of runtimes
2012-11-18 19:32:58 +04:00
cib
d0a542bc54
You now come out of cloning with slightly more damage.
2012-11-18 16:18:22 +01:00
Chinsky
684679cefb
Fixes issue #1971
...
Lasertag and practice beams won't explode tanks anymore.
2012-11-18 11:24:17 +04:00
Ispil
ce0c2fc792
Fix to Issue #1961 . Changes the Space Law book to link to the Baystation 12 wiki. Also changes the Engineering Textbook to link to the Baystation 12 wiki.
2012-11-17 12:16:02 -07:00
Chinsky
ea4f34d53c
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/ZAS/FEA_system.dm
2012-11-17 00:20:23 +04:00
Ater Ignis
8c5b8f8d50
final pass of merging with my branch
...
I hope I have not forgot anything
Still, it compiled for me at least, and passes test cases i did
2012-11-16 18:54:43 +04:00
Ater Ignis
46bd2ce7e6
human icon generation update, tajarnan darkseeing
...
*lying icon generated from standing one
*sprites for dismembering major races (tajarnan,skrell,soghun)
*tajarnans can see in darkness better than others
2012-11-16 15:19:20 +04:00
Chinsky
750dc608fc
Should prevent cloned Skrells and cats losing ears/tentacles after cloning.
2012-11-16 13:36:58 +04:00
Mloc
be9ab53289
Merge pull request #1951 from CIB/master
...
Fixes
2012-11-15 10:47:47 -08:00
cib
866a113494
Fixes for issue #1872
2012-11-15 18:40:24 +01:00
Mloc
7af340aa59
Merge pull request #1950 from comma/master
...
Fixes, fixes.
2012-11-15 08:49:09 -08:00
cib
0e11e0c041
Fix for issue #1947
...
Fire alarms now clear from computers when cancelled.
2012-11-15 17:48:13 +01:00
Mloc
a2bced69bc
Merge pull request #1949 from CIB/master
...
Fixes
2012-11-15 08:45:45 -08:00
cib
f48822e5a2
Fixes issue #1900
...
There are now two roboticist spawn slots.
2012-11-15 16:39:39 +01:00
Chinsky
7a516a4cf8
Can fix limbs with welders again. And attack mobs with welders at all.
...
Fixes #1886
2012-11-15 18:04:03 +04:00
Chinsky
0748a0424e
Tweak for medical doctors spawn.
...
Now MDs spawn with pants on.
Reverted my 'spawn naked' change.
2012-11-15 17:33:52 +04:00
Cael_Aislinn
addb95137c
made autoinjectors visible again, fixed medibot construction, fixed tajaran ears while lying down
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-11-15 21:02:04 +10:00
Hawk-v3
317e40795a
Merge pull request #1939 from CIB/master
...
Misc stuff
2012-11-14 10:29:57 -08:00
cib
a63e26651f
Merge git://github.com/comma/Baystation12
2012-11-14 18:16:41 +01:00
cib
0491390edc
Corrected the blood warning levels in medical scanner.
2012-11-14 18:13:04 +01:00
cib
450248864b
Added lung rupturing and lung surgery.
2012-11-14 16:20:47 +01:00
Chinsky
3caa7a14d3
Added science alt_titles
2012-11-14 15:21:56 +04:00
Chinsky
eaeb8a1bd6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-14 14:59:07 +04:00
Chinsky
29c295fee9
Made Virologist an alt_title of MD.
2012-11-14 14:58:41 +04:00
SkyMarshal
2fece529af
Fixed a compile warning, reverted my grenade changes as requested by mangled, readded unsecuring-of-the-AI-with-a-wrench and the associated traitor objective checks, tweaked my previous commit re:adminhelps.
2012-11-13 22:46:43 -07:00
Ater Ignis
2400495619
seems i broke some >_<
2012-11-14 00:45:21 +04:00
cib
422ec63bfc
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
code/game/objects/items/devices/scanners.dm
code/modules/mob/living/carbon/human/human.dm
2012-11-13 19:01:03 +01:00
cib
ee785a17fc
Radiation announcement now happens before radiation.
2012-11-13 17:55:59 +01:00
cib
9a9e33b4ea
Disable silly radiation event mutations.
2012-11-13 17:52:03 +01:00
cib
c7b8bda2af
Merge branch 'master' of github.com:CIB/Baystation12
2012-11-13 17:14:58 +01:00
cib
3dc4a56554
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-11-13 15:39:38 +01:00
CIB
74c5235c9d
Added back the "unknown substance" message
2012-11-13 14:11:03 +01:00
Chinsky
8e60315b11
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2012-11-13 04:02:26 +04:00
Chinsky
bd20233c35
Added color coding to health analyzers, much like crew monitors.
...
Numbers for each damage will be written in corresponding color, bolded if above 50.
2012-11-13 01:56:31 +04:00
Ispil
2a7aab1042
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-12 13:21:07 -07: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
Ispil
814a670572
Fix to issue #1887 .
2012-11-12 12:29:55 -07:00
cib
4b331f3676
Fixes to internal bleeding.
...
- Created internal wound doesn't close instantly anymore.
- Small fix to body scanner display.
2012-11-12 14:16:19 +01:00
cib
e92cecdefe
Added basic germ code.
...
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
2012-11-12 12:51:28 +01: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
