cib
4c49e51182
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into BEF
2013-02-14 13:05:27 +01:00
RavingManiac
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
cib
a9c13cdf37
Merge branch 'master' of github.com:Baystation12/Baystation12 into BEF-staging
2013-02-13 20:13:04 +01:00
Erthilo
6d6787b89b
Fixes newcaster censoring not censoring photos.
2013-02-13 18:01:14 +00:00
Erthilo
ed76409141
Fixes mice emotes and Set-Pose verb periods.
2013-02-13 17:10:19 +00:00
Erthilo
7827680f66
Fixes virus crate having no model and cost.
2013-02-13 17:09:54 +00:00
Erthilo
e5fcb91fb0
Fixes SSD not being prolonged.
...
Signed-off-by: Erthilo <erthilo@gmail.com >
2013-02-13 10:35:09 +00:00
cib
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
cib
cf56a206b3
Medical side effects confirmed to work now.
2013-02-12 17:50:06 +01:00
cib
7a0c37867a
Adjusted medical side effect strength.
2013-02-12 17:14:10 +01:00
cib
1ed5c7ec37
Previously your nanotrasen loyalty setting wouldn't save.
2013-02-12 16:57:33 +01:00
cib
3f04c7ae99
Bugfix for medical side effects.
2013-02-12 16:38:44 +01:00
cib
62c906cd30
Merge branch 'feature' of github.com:CIB/Baystation12 into feature
2013-02-12 16:20:50 +01:00
cib
1648c69f9d
Implemented medical side-effects.
2013-02-12 16:19:39 +01:00
cib
c6f40e3a6d
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
2013-02-12 13:32:39 +01:00
RavingManiac
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
RavingManiac
4f8a8ed0cf
Allows mice to pass over/under tables.
2013-02-12 17:35:15 +08:00
RavingManiac
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
Zuhayr
b97890b896
Icons and code for an NT-knockoff soghun space suit.
2013-02-11 19:23:23 -08:00
Zuhayr
5c8aa6b6f9
Merge resolution.
2013-02-11 16:41:32 -08:00
cib
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
cib
dd4949bc62
Merge branch 'master' into feature
2013-02-10 22:58:32 +01:00
cib
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
Chinsky
d23d56cb70
Merge pull request #2306 from CIB/master
...
Cleanly amputated limbs should not bleed.
2013-02-10 11:45:27 -08:00
cib
aa753a7f3c
Cleanly amputated limbs should not bleed.
2013-02-10 20:43:32 +01:00
Chinsky
6b10b8a564
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-02-09 23:57:10 +04:00
Chinsky
2b7da59f1f
Readded limb cutoff surgery.
2013-02-09 22:43:39 +04:00
Chinsky
7aa175b444
readded painkillers YET AGAIN
2013-02-09 22:10:50 +04:00
Chinsky
18932d79ac
bad indentation on one of cocktails
2013-02-09 22:06:19 +04:00
Chinsky
f13fc01dbf
Merge pull request #2285 from caelaislinn/bleeding-edge-freeze
...
Merge from master, post TG update feedback
2013-02-09 09:50:37 -08:00
Chinsky
839500c8fb
Fixed msay links.
2013-02-09 21:42:52 +04:00
cib
934eae1d15
Removes new event code and reinstates old event code.
2013-02-09 18:38:35 +01:00
cib
9fa8509569
Virus event is now again virus2.
2013-02-09 18:04:24 +01:00
cib
863a9deb7b
Added NT relation preference.
2013-02-09 17:55:53 +01:00
RavingManiac
b600b54f61
Traitor's revolver is now w_class=2.0 (pocketable). Sprite is now that of a snub-nosed revolver.
2013-02-09 20:24:29 +08:00
Gamerofthegame
ead9a020bf
I am tired of doing this
2013-02-08 17:46:05 -05:00
Cael_Aislinn
f6d3114d6e
mice no longer have universal speak, carp and giant spiders will no longer carve through the station, removed unused item
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-09 01:13:30 +10:00
Cael_Aislinn
c490357f4a
tweaks to a couple of random events, removed spider infestation and alien infestation from random list
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-09 01:11:36 +10:00
Cael_Aislinn
84877454ed
removed old event files, re-added old ion storm
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-09 01:08:59 +10:00
Chinsky
2221162315
Fixed issue with newscaster channels not working with ' in them.
2013-02-07 21:48:40 +04:00
Chinsky
61a7634c6f
Fixed typo in AttoUrney's job.
2013-02-07 21:47:56 +04:00
Chinsky
4dd238107b
Added lung fixing and disease curing things to adminrevive.
2013-02-07 21:47:24 +04:00
Chinsky
4d7aa320cb
Due to git tree being fucked up for some reason, manually reapplied many man many fixes.
...
Just got to tip of real tree and got zipball, then unpacked it here.
2013-02-07 07:13:27 +04:00
Chinsky
75341efb38
Missing PM link in msay.
2013-02-07 06:17:48 +04:00
Chinsky
08b9c538e0
readded missing tramadol reagent
2013-02-07 05:59:58 +04:00
Chinsky
0cce21ca87
Did it get reverted or something... witchery.
...
Anyway, mods jumpy again.
2013-02-07 05:54:27 +04:00
Chinsky
67a9028b9c
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-02-07 05:48:48 +04:00
Chinsky
f25ba15c2f
removed debug print
2013-02-07 05:48:19 +04:00
Hawk-v3
1117db050d
Merge pull request #2271 from comma/master
...
Fixes Take Three
2013-02-06 15:47:14 -08:00
Chinsky
4739184104
OH GEE LET'S LET EVERYONE AND THEIR ADMIN OBSERVER MOM USE THESE VERBS NOTHING CAN POSSIBLY GO WRONG.
...
Slapped rights checks on verbs in VV menu.
2013-02-07 03:40:01 +04:00