2221162315
Fixed issue with newscaster channels not working with ' in them.
2013-02-07 21:48:40 +04:00
61a7634c6f
Fixed typo in AttoUrney's job.
2013-02-07 21:47:56 +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
1117db050d
Merge pull request #2271 from comma/master
...
Fixes Take Three
2013-02-06 15:47:14 -08:00
5801385443
Fix for alt titles not having access.
2013-02-07 02:37:35 +04:00
5fdd6462a1
Merge pull request #2265 from Gamerofthegame/bleeding-edge-freeze
...
Map fixes
2013-02-06 13:54:31 -08:00
058395a4ec
Now washign hands will update sprite.
2013-02-06 22:01:24 +04:00
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
093fcfb721
Wizard: Hugbox Edition.
...
Removed Ei Nath and mass gun spawn.
2013-02-06 19:58:53 +04:00
e44f84b526
fixing robolimbs - that was here some time ago, but removed with update
2013-02-06 15:15:31 +04:00
af959303a0
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch
2013-02-06 21:07:57 +10:00
1d291fff11
load alien whitelist on startup, all races available if not using WL
2013-02-06 13:35:01 +04:00
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
57703df2f9
Merge pull request #2261 from comma/master
...
Fixes
2013-02-06 01:02:27 -08:00
f4b08b0923
Made adminlog messages not visible to mods again.
...
Return of attacklog spam (now toggleable)
2013-02-06 06:14:31 +04:00
c0ce1bef8e
SHUT UP VENDOMAT NO I DO NOT WANT THAT CANDY BAR
2013-02-06 01:01:57 +04:00
55479a7b99
'Only in effect if can_hold is not set' my ass.
...
Fixed belts stil not accepting batons and tasers.
2013-02-06 00:49:44 +04:00
027955d3d2
Fixed invisible Ripley bug, added line of fluff to posibrain join message, reduced posibrain requirements.
2013-02-06 04:07:32 -08:00
fdb2bd0e76
Fixes issues with stool grabbing.
...
Stool children no longer can be taken in hand like papa stool.
Hate this class structure.
2013-02-05 15:53:53 +04:00
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
16bea39176
Fix for #2226 , Camera runtimes.
...
Also now cameras on 2.1.0.1 is TG compliant!
2013-02-02 22:46:24 +04:00
c944fd92c2
ported fix for #2051 from master
2013-02-02 22:23:10 +04:00
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
2023253cac
Fixes newly built plating repressurizing rooms.
2013-02-02 19:16:16 +04:00
3f62e2a938
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
...
Conflicts:
baystation12.dme
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Machinery.dm
code/modules/research/xenoarchaeology/artifact_effect.dm
code/modules/research/xenoarchaeology/finds.dm
icons/obj/device.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-02 17:05:27 +10:00
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
05bd27d777
re-enabled air profiling, some tweaks to turf changes to resolve outstanding issues (will be overwritten by master)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-01 23:07:28 +10:00
a6ae09bccf
fix for some zas runtimes, overrepressurisation after sealing breaches, zones not properly restructuring during some breaches
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-01 22:50:34 +10:00
ae16d81888
fix for blueprint areas randomly disappearing after a while, blueprint areas power not working, blueprint areas lighting being [initially] borked
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-01 22:49:24 +10:00
5d090b0611
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into guntest
...
Conflicts:
code/WorkInProgress/Cib/amorph/amorph_hud.dm
code/game/objects/structures/window.dm
code/modules/mob/living/blob/blob.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/mob_defines.dm
code/modules/mob/screen.dm
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/projectile/automatic.dm
maps/tgstation.2.0.9.1.dmm
2013-01-31 14:26:58 -08:00
e54e44d495
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
...
Conflicts:
code/game/gamemodes/events.dm
2013-01-31 11:15:32 +01:00
9691e497b1
Event code fixes.
...
- Previously base event chance would get applied twice, so instead of e.g. 0.03 chance, a 0.03^2 chance
- Removed unused code
2013-01-31 11:03:48 +01:00
24cf3c2dd0
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/datums/supplypacks.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/mob/new_player/new_player.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
icons/mob/suit.dmi
icons/obj/drinks.dmi
2013-01-30 16:39:00 +04:00
0bcda84eeb
Fixed issue with magical wooden table disassembling.
...
Generally cleaned up table code.
2013-01-30 01:31:06 +04:00
d1972efbb8
Can order contraband crates.
...
Moved most of 'contraband' out of crate to others.
2013-01-28 18:07:34 +04:00
458726fd88
Now rest of admin ranks will at least have OOC.
2013-01-28 01:22:58 +04:00
3ceaa7e4d8
Nerfed environmental robusting a bit
2013-01-24 14:49:15 +04:00
e7c10c44cd
made delay round end work after restart timer has started, made delay verb also delay round end
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-24 15:38:23 +10:00
7a66e7e524
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
code/setup.dm
2013-01-22 23:46:42 +04:00
7310e4bd06
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
...
Conflicts:
baystation12.dme
code/modules/reagents/Chemistry-Reagents.dm
html/changelog.html
2013-01-22 20:07:10 +04:00
9792a1c983
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/game/machinery/hydroponics.dm
code/modules/reagents/Chemistry-Reagents.dm
html/changelog.html
2013-01-22 20:05:45 +04:00
7f05c6fdb3
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/jobs/job/captain.dm
code/game/jobs/job/security.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/mob/living/carbon/human/hud.dm
html/changelog.html
icons/obj/items.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 01:02:27 +10:00
104bc8dd98
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/datums/supplypacks.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/security.dm
code/modules/clothing/spacesuits/rig.dm
icons/mob/head.dmi
icons/mob/suit.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 00:48:07 +10:00
fb2b2a1d52
various compile fixes
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 00:43:54 +10:00
bb5a349fcf
Merge branch 'incremental_tg' r5600 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/global_lists.dm
code/controllers/master_controller.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/hud.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/job.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/machinery/computer/cloning.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/weapons/gift_wrappaper.dm
code/game/objects/items/weapons/implants/implantnanoaug.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/turfs/turf.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/shoes/miscellaneous.dm
code/modules/clothing/under/ties.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/silicon/say.dm
code/modules/mob/mob_defines.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/pen.dm
code/modules/paperwork/stamps.dm
code/modules/projectiles/projectile.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/reagent_containers/glass.dm
code/setup.dm
config/config.txt
html/changelog.html
icons/effects/effects.dmi
icons/mob/feet.dmi
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/mob/ties.dmi
icons/mob/uniform.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/ties.dmi
maps/tgstation.2.1.0.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 00:23:37 +10:00
7932f1f795
removed extraneous line in detectivework/evidence.dm, removed constructing closets from plasteel
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-22 17:56:57 +10:00
0c2c999f74
money! re-added atms, created account system / accounts database, whole bunch of options for moving money around, some tweaks to spacecash and icons
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-22 17:56:34 +10:00
3ac21339c1
You can now make a single camera use multiple networks.
...
var/network = string is now var/list/network = list().
I've also added a "network_multi" var which is a string. This is specifically for placing cameras on a map that you want to put on multiple networks. Apparently DM's map maker doesn't support lists, so just type them all in as a string and camera/initialize() will take care of the rest.
Input the networks with commas seperating them, for example: "SS13,RD,Secret,Prison,Ect"
I fixed a few issues while editing the cameras on the map as well.
Both maps:
- Re-added the telescreen in the misc research room that got removed at some point. (Thanks to Ikarrus for pointing this out)
- Any room that had 2 cameras (one for each network) were merged into one camera with the new network lists.
- - Permabrig-hallway (SS13, Prison)
- - Every room in R&D (including robotics) (SS13, RD)
- - The bomb testing range (RD, Toxins)
tgstation.2.1.1.dmm:
- Added a missing wire in engineering-sec (Thanks to SuperSayu for pointing this out)
- Fixed some mis-orientated firelocks. (Thanks to Intigracy for pointing this out)
- - The mining door between cargo and mining
- - The door between the hallway and the engineering lobby
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5596 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-22 01:24:09 +00:00
bb4be2c86a
moved cryo cells to the same layer as tables - this will look weird for stuff on the top tile ('behind' the cry cell) but beakers wont be hidden underneath it when they're ejected any more, fixed typo in escape shuttle, fixed syntax error in new player setup screen
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-21 19:25:19 +10:00
66ce65a680
minor tweaks and cleanup with events, readded meteor shower and grid check events, removed most unused event files (left some interesting ones)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-21 19:15:38 +10:00
Chinsky