Commit Graph

5280 Commits

Author SHA1 Message Date
Cael_Aislinn
6918fb0ef9 new crew manifest for id computers, tweaks to manifest to better fit window, renamed roboticist alt title post-feedback
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 12:56:57 +10:00
Cael_Aislinn
fea6635060 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/game/verbs/who.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 01:25:47 +10:00
Cael_Aislinn
c4176beb3e some more useability tweaks to adminwho/modwho
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 00:56:53 +10:00
Cael_Aislinn
da9b87a288 beepsky now fights hostile NPC mobs, and vice versa
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 00:32:49 +10:00
Chinsky
0b8bae86ae Only bandaging bleeding wounds would cause itching. Bruise packs give out different message during treatment depending on type and severity of wound. 2013-02-17 18:31:14 +04:00
Chinsky
5c13beaf59 Fixed issue #2341 2013-02-17 17:57:23 +04:00
Cael_Aislinn
cabc70398b added some info text to adminwho/modwho
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-17 11:12:17 +10:00
cib
eaa8130672 Balance fixes to medical side-effects.
- Bandage/ointment now causes itch instead of cramps
- Reduced amount of messages/effects by side-effects to 1/3
- Side-effects will now disappear after a while if left untreated, but they will cause damage before that.
2013-02-15 14:25:11 +01:00
Gamerofthegame
713176a466 Changes Secret-Nuke ready requirements from 15 to 25. 2013-02-14 22:50:01 -05:00
cib
afccc33ddb Forgot to give MD virology access. 2013-02-14 23:13:18 +01:00
cib
1c341af3e9 Merge branch 'feature' of github.com:CIB/Baystation12 into feature 2013-02-14 16:30:29 +01:00
cib
484c936c6d Fixed a bug with intercept reports. 2013-02-14 16:29:07 +01:00
cib
644e309594 Virologist is an alt title again. 2013-02-14 15:36:06 +01:00
Cael_Aislinn
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
Cael_Aislinn
d1e6e342c5 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-14 22:10:02 +10:00
cib
5b6fd2de48 Merge branch 'master' of github.com:Baystation12/Baystation12 into BEF 2013-02-14 13:05:37 +01:00
cib
4c49e51182 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into BEF 2013-02-14 13:05:27 +01:00
Cael_Aislinn
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
Christian Bielert
e64297e162 Merge pull request #2321 from Gamerofthegame/master
Map update: Signs n Pipes
2013-02-14 03:36:29 -08: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
Gamerofthegame
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
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
Cael_Aislinn
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
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
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
Cael_Aislinn
6668458b09 fixed some admin colour OOC bugs, restructured/cleaned up how OOC messages are sent (retained original code commented out, in case)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-10 21:27:54 +10:00
Cael_Aislinn
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
Cael_Aislinn
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
Cael_Aislinn
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
Cael_Aislinn
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
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
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
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
Hawk-v3
1117db050d Merge pull request #2271 from comma/master
Fixes Take Three
2013-02-06 15:47:14 -08:00
Chinsky
5801385443 Fix for alt titles not having access. 2013-02-07 02:37:35 +04:00
Chinsky
5fdd6462a1 Merge pull request #2265 from Gamerofthegame/bleeding-edge-freeze
Map fixes
2013-02-06 13:54:31 -08:00
Chinsky
058395a4ec Now washign hands will update sprite. 2013-02-06 22:01:24 +04:00
Chinsky
e02d79062f Fixed medical alt titles spawning naked, as much as I approve of Nurses doing it.
Fixed ID having general rank instead of alt title.
Axed out some ambiguous alt titles, made capitalization more consistent in others.
2013-02-06 20:30:31 +04:00
Chinsky
093fcfb721 Wizard: Hugbox Edition.
Removed Ei Nath and mass gun spawn.
2013-02-06 19:58:53 +04:00
Ater Ignis
e44f84b526 fixing robolimbs - that was here some time ago, but removed with update 2013-02-06 15:15:31 +04:00
Ater Ignis
1d291fff11 load alien whitelist on startup, all races available if not using WL 2013-02-06 13:35:01 +04:00
Ater Ignis
a8d38c5b76 iv drip taking blood can't be just syringe copypaste - stupid having 50 different blood-datums of 4 in volume 2013-02-06 13:28:21 +04:00
Cael Aislinn
57703df2f9 Merge pull request #2261 from comma/master
Fixes
2013-02-06 01:02:27 -08:00
Chinsky
f4b08b0923 Made adminlog messages not visible to mods again.
Return of attacklog spam (now toggleable)
2013-02-06 06:14:31 +04:00