5b14c1f13f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-02-14 13:11:36 -05:00
1c341af3e9
Merge branch 'feature' of github.com:CIB/Baystation12 into feature
2013-02-14 16:30:29 +01:00
484c936c6d
Fixed a bug with intercept reports.
2013-02-14 16:29:07 +01:00
644e309594
Virologist is an alt title again.
2013-02-14 15:36:06 +01:00
c5301c5144
Fixes issue #2296 : Humans will not react to sleep toxins in smaller amounts than can be scrubbed.
2013-02-14 15:06:10 +01:00
5217227f9a
Fixes issue #2309 : Infected blood now infects again.
2013-02-14 14:45:52 +01:00
ff222c2f13
fixed biomass/spacevine spawning, tweaked event probabilities, made aliens default to disabled as a random event
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-14 23:17:54 +10:00
d1e6e342c5
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-02-14 22:10:02 +10:00
5b6fd2de48
Merge branch 'master' of github.com:Baystation12/Baystation12 into BEF
2013-02-14 13:05:37 +01:00
4c49e51182
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into BEF
2013-02-14 13:05:27 +01:00
49e4eaeffb
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
maps/tgstation.2.1.0.0.1.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-14 22:02:06 +10:00
f0de14d0d4
fixed xenoarch chemical analysis, added icons for excavation picks, various misc tweaks
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-14 21:59:50 +10:00
e64297e162
Merge pull request #2321 from Gamerofthegame/master
...
Map update: Signs n Pipes
2013-02-14 03:36:29 -08:00
4eca9b143e
Player-controlled mice spawn next to a vent by default, spawn at MOB_LAYER, can nibble food to regain health, can pass through plastic flaps, and can climb into disposal units.
...
Mice cannot pull objects.
2013-02-14 16:15:20 +08:00
3e2b43bce6
Grants security maint access again, Detective security access again, allows two roboticists to spawn at the start of the round instead of just one and removed chef's access to the morgue. Kept Hydro's, though, because they can plant-clone people and that makes sense. All tested, works out perfectly fine.
2013-02-14 00:46:57 -05:00
431002cb30
reduced drone damage + increased health, halved explosion damage (approx) + made exploding more obvious, reduced max drone tech bonus to 6, bit of cleanup in the AI
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-14 14:58:15 +10:00
7fba00ce55
miscellaneous fixes + tweaks + cleanups (spoons, artifacts, geotracking, helpers for finds, tools / gear)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-14 13:28:31 +10:00
a9c13cdf37
Merge branch 'master' of github.com:Baystation12/Baystation12 into BEF-staging
2013-02-13 20:13:04 +01:00
6d6787b89b
Fixes newcaster censoring not censoring photos.
2013-02-13 18:01:14 +00:00
ed76409141
Fixes mice emotes and Set-Pose verb periods.
2013-02-13 17:10:19 +00:00
7827680f66
Fixes virus crate having no model and cost.
2013-02-13 17:09:54 +00:00
e5fcb91fb0
Fixes SSD not being prolonged.
...
Signed-off-by: Erthilo <erthilo@gmail.com >
2013-02-13 10:35:09 +00:00
d89c4e744f
renamed a file, added rogue drones random event (laser drones spawn and fly around the map, teleport out after a while), added infestation random event (lizards, mice, slimes spawn on the map in some rooms)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-13 17:50:57 +10:00
e6e4b89819
disabled simultaneous admin PM warning
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-13 17:49:48 +10:00
7cc207583a
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
baystation12.dme
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-13 12:30:01 +10:00
dd822cc985
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-02-13 12:26:01 +10:00
bbfbfb0ca2
tweaks to artifact spawning, tweaks and fixes to multiple anomalous artifact effects
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-13 12:23:20 +10:00
b9bd5ca3e2
renamed two files, restructured tools and anomaly suits to semi-final format
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-13 12:22:30 +10:00
31cd43945d
Added various new side effects:
...
- Headache triggered by bicaridine, alkysine and cryoxadone, treated with tramadol or alkysine
- Cramps triggered by bandages and ointment, treated with inaprovaline
- Bad stomach, triggered by dermaline, kelatone or being cloned, treated with anti-toxin
2013-02-12 18:20:57 +01:00
cf56a206b3
Medical side effects confirmed to work now.
2013-02-12 17:50:06 +01:00
e34d033cc9
Moved tag whitelist check to HELPERS.
...
Removed img tag from whitelist.
2013-02-12 20:43:22 +04:00
7a0c37867a
Adjusted medical side effect strength.
2013-02-12 17:14:10 +01:00
1ed5c7ec37
Previously your nanotrasen loyalty setting wouldn't save.
2013-02-12 16:57:33 +01:00
fea160d6f0
Merge branch 'master' into HTML
2013-02-12 19:39:00 +04:00
3f04c7ae99
Bugfix for medical side effects.
2013-02-12 16:38:44 +01:00
62c906cd30
Merge branch 'feature' of github.com:CIB/Baystation12 into feature
2013-02-12 16:20:50 +01:00
1648c69f9d
Implemented medical side-effects.
2013-02-12 16:19:39 +01:00
b63bc43820
new sprites, reworked digspite spawning and geosamples to fit artifacts, misc tweaks (admin logging on syndie beacon, energy field)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-12 22:55:07 +10:00
f37c608dd1
restructured the layout of many files with folders + renames, added artifact types and artifact effects
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-12 22:53:55 +10:00
c6f40e3a6d
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
2013-02-12 13:32:39 +01:00
83d7031728
Revert "Traitor's revolver is now w_class=2.0 (pocketable). Sprite is now that of a snub-nosed revolver."
...
This reverts commit b600b54f61
2013-02-12 17:43:28 +08:00
4f8a8ed0cf
Allows mice to pass over/under tables.
2013-02-12 17:35:15 +08:00
d8269c0834
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
ow that of a snub-nosed revolver."
This reverts commit b600b54f61
2013-02-12 02:53:23 +08:00
b97890b896
Icons and code for an NT-knockoff soghun space suit.
2013-02-11 19:23:23 -08:00
5c8aa6b6f9
Merge resolution.
2013-02-11 16:41:32 -08:00
f424a2c4c0
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
...
Conflicts:
baystation12.dme
code/modules/mob/living/simple_animal/hostile/giant_spider.dm
2013-02-10 23:07:55 +01:00
dd4949bc62
Merge branch 'master' into feature
2013-02-10 22:58:32 +01:00
104d21e9e2
Simple animal balance fixes:
...
- Reduced the speed of most simple animals to 4, so now you can get away if you're fast and they don't shoot you
- Added a mechanic that determines how likely a hostile animal is to smash in a window, and made this chance very low for carp
- Simple animals will no longer attack people in crit
2013-02-10 22:56:40 +01:00
d23d56cb70
Merge pull request #2306 from CIB/master
...
Cleanly amputated limbs should not bleed.
2013-02-10 11:45:27 -08:00
aa753a7f3c
Cleanly amputated limbs should not bleed.
2013-02-10 20:43:32 +01:00
Asanadas