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
|
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
|
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 |
|
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 |
|
Chinsky
|
5fdd6462a1
|
Merge pull request #2265 from Gamerofthegame/bleeding-edge-freeze
Map fixes
|
2013-02-06 13:54:31 -08:00 |
|
Chinsky
|
8396c9fb3f
|
Fixed double definition of ethanol.
Fixed issue with emotes being slurred up.
|
2013-02-06 21:38:21 +04:00 |
|
Chinsky
|
f114cdaf01
|
Fixed burn damage treated as brute one for organs.
|
2013-02-06 19:29:05 +04:00 |
|
Chinsky
|
1e44b47b83
|
No, monkeys do not have organs, stop lying.
|
2013-02-06 19:19:38 +04:00 |
|
Chinsky
|
8e958b11a2
|
Gave back rigs some fire protection.
Removed double definition for metablism.
|
2013-02-06 19:15:33 +04:00 |
|
Ater Ignis
|
8400960fc6
|
allright, my fault on this line
|
2013-02-06 15:20:03 +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
|
b63cfcc715
|
incompatible blood adds as toxins but 2 times less than original blood
|
2013-02-06 13:26:50 +04:00 |
|
Ater Ignis
|
bbac110a17
|
correct blood_incompatible proc
|
2013-02-06 13:22:12 +04:00 |
|
Ater Ignis
|
b2d4a576c6
|
away-mission loader process&memory-leak
|
2013-02-06 13:20:39 +04:00 |
|
Cael Aislinn
|
57703df2f9
|
Merge pull request #2261 from comma/master
Fixes
|
2013-02-06 01:02:27 -08:00 |
|
Chinsky
|
f9894599cf
|
Readded Show Skills verb
|
2013-02-06 07:23:27 +04:00 |
|
Chinsky
|
558a479954
|
Fix for Command Report runtime.
|
2013-02-06 07:05:41 +04:00 |
|
Chinsky
|
51b4005442
|
Fixed emitter logging only workign for turning it off.
|
2013-02-06 06:52:36 +04: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 |
|
Zuhayr
|
027955d3d2
|
Fixed invisible Ripley bug, added line of fluff to posibrain join message, reduced posibrain requirements.
|
2013-02-06 04:07:32 -08:00 |
|
Chinsky
|
db5b00cd61
|
Quick fix for mods not being able to access CA from some places
|
2013-02-05 17:17:39 +04:00 |
|
Chinsky
|
e68dcce602
|
Msay and adminhelps now go to admins and mods.
|
2013-02-05 16:44:15 +04:00 |
|
Chinsky
|
7528570b1b
|
Added verb to toggle deadchat to everyone who can hear it.
Mods now can ghostjump again.
|
2013-02-05 15:51:07 +04:00 |
|
Chinsky
|
5a23ec6485
|
Fixed asay being visible to moderators.
|
2013-02-03 00:50:39 +04:00 |
|
Chinsky
|
f4469083b2
|
Made permission checks for some verbs more TG-compliant.
Fixed Edit Appearance verb.
Removed DB verb since we are not using SQL and it'll only confuse admins.
|
2013-02-03 00:10:29 +04:00 |
|
Chinsky
|
e74cd95fec
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
code/game/turfs/turf.dm
code/modules/clothing/spacesuits/rig.dm
|
2013-02-02 23:10:12 +04:00 |
|
Chinsky
|
f553a66553
|
Fixed two hairstyles having same name.
|
2013-02-02 22:16:38 +04:00 |
|
Chinsky
|
c4997a34f1
|
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
Conflicts:
code/modules/mob/new_player/new_player.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
|
2013-02-02 20:00:10 +04:00 |
|
Chinsky
|
bc340028be
|
Made atmos suit fire-resistant again and handled slowdown changes in a less clutery way.
|
2013-02-01 20:30:58 +04:00 |
|
Cael_Aislinn
|
06809c3651
|
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
code/controllers/master_controller.dm
code/modules/mob/new_player/sprite_accessories.dm
code/modules/reagents/Chemistry-Reagents.dm
code/setup.dm
icons/mob/human_face.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
|
2013-02-01 23:45:13 +10:00 |
|
Cael_Aislinn
|
b310da9bb9
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/sprite_accessories.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
code/setup.dm
html/changelog.html
icons/mob/human_face.dmi
also a sneaky issue resolution caused in spiky taj hair
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
|
2013-02-01 23:25:45 +10:00 |
|
Cael_Aislinn
|
2d15506667
|
removed extraneous rig slowdowns
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
|
2013-02-01 22:46:24 +10:00 |
|
Cael_Aislinn
|
6743f09ef2
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12
|
2013-02-01 13:57:27 +10:00 |
|
cib
|
e9d7b5ce0d
|
Missing part of tajaran ear commit.
|
2013-01-31 20:04:22 +01:00 |
|
cib
|
4a39d9b53b
|
Fixes for gamebreaking metabolism rates
- A single chili doesn't kill anymore
- Chloral hydrate no longer kills in amounts of 2 units
|
2013-01-31 18:04:51 +01:00 |
|
Chinsky
|
3e153c074c
|
Replaced courtroom with meeting room.
|
2013-01-30 19:15:49 +04:00 |
|