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
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
ed76409141
Fixes mice emotes and Set-Pose verb periods.
2013-02-13 17:10:19 +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
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
1ed5c7ec37
Previously your nanotrasen loyalty setting wouldn't save.
2013-02-12 16:57:33 +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
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
eb02fb3636
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
baystation12.dme
code/modules/events/event_manager.dm
code/modules/events/ion_storm.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-11 02:56:07 +10:00
f29c19e52c
added global PM visibility for mods
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-11 02:51:55 +10:00
0dde35b385
unique voice text colour for soghun, skrell and taj
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 22:36:23 +10:00
28b5096ab3
players can choose the bottle icon of new pill bottles, forgot to save map
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:55:40 +10:00
c05b9869e6
restructured/cleaned up how admin-pms are sent (retained original code just in case), made it so that only holders with R_ADMIN can see private messages, added a timeout warning to anyone PMing a player so they dont get spammed (default to 5 seconds, config edited)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:29:02 +10:00
0ad89c7953
removed moderators from adminwho, added new globally accessible verb to show online moderators
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:25:29 +10:00
15bc6ed7b2
restructured event system, re-merged CIB's event system with TG's
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:24:31 +10:00
6443eeaa7a
made carp and giant spiders not carve sections out of the station, removed meese's universal speak
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:23:37 +10:00
5b0f31e89f
tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:22:02 +10:00
4500be323c
removed unused event files, added some new events from unused ones, restructured/tweaked some event procs
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:12:40 +10:00
6b10b8a564
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-02-09 23:57:10 +04:00
2b7da59f1f
Readded limb cutoff surgery.
2013-02-09 22:43:39 +04:00
7aa175b444
readded painkillers YET AGAIN
2013-02-09 22:10:50 +04:00
18932d79ac
bad indentation on one of cocktails
2013-02-09 22:06:19 +04:00
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
839500c8fb
Fixed msay links.
2013-02-09 21:42:52 +04:00
934eae1d15
Removes new event code and reinstates old event code.
2013-02-09 18:38:35 +01:00
863a9deb7b
Added NT relation preference.
2013-02-09 17:55:53 +01:00
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
ead9a020bf
I am tired of doing this
2013-02-08 17:46:05 -05:00
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
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
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
4dd238107b
Added lung fixing and disease curing things to adminrevive.
2013-02-07 21:47:24 +04:00
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
75341efb38
Missing PM link in msay.
2013-02-07 06:17:48 +04:00
08b9c538e0
readded missing tramadol reagent
2013-02-07 05:59:58 +04:00
Cael_Aislinn