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
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
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
4f8a8ed0cf
Allows mice to pass over/under tables.
2013-02-12 17:35:15 +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
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
aa753a7f3c
Cleanly amputated limbs should not bleed.
2013-02-10 20:43:32 +01: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
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
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
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
1117db050d
Merge pull request #2271 from comma/master
...
Fixes Take Three
2013-02-06 15:47:14 -08:00
5fdd6462a1
Merge pull request #2265 from Gamerofthegame/bleeding-edge-freeze
...
Map fixes
2013-02-06 13:54:31 -08:00
8396c9fb3f
Fixed double definition of ethanol.
...
Fixed issue with emotes being slurred up.
2013-02-06 21:38:21 +04:00
f114cdaf01
Fixed burn damage treated as brute one for organs.
2013-02-06 19:29:05 +04:00
1e44b47b83
No, monkeys do not have organs, stop lying.
2013-02-06 19:19:38 +04:00
af959303a0
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch
2013-02-06 21:07:57 +10: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
f553a66553
Fixed two hairstyles having same name.
2013-02-02 22:16:38 +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
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
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
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
e9d7b5ce0d
Missing part of tajaran ear commit.
2013-01-31 20:04:22 +01:00
3e153c074c
Replaced courtroom with meeting room.
2013-01-30 19:15:49 +04: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
f8ca13262c
Fix issue #2193
2013-01-29 18:07:18 +01:00
10127c4f34
Fixed gun aiming HUD buttons, other WIP junk
2013-01-27 17:34:12 -08:00
84ebfea65a
'
2013-01-22 15:25:37 -05: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
79b17d0c1d
Furry delight, more facial hairs and hairstyles for space cats.
...
Sprites provided by Mister_Fox
2013-01-22 21:52:40 +04:00
7d0fb3d51a
compile / dme fixes, removed unused file
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 01:11:19 +10: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
090495f386
Merge pull request #2205 from caelaislinn/bleeding-edge-freeze
...
Miscellaneous (see desc)
2013-01-22 06:55:44 -08: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
005acb5529
Runtime fix for:
...
runtime error: Cannot read null.name
proc name: New (/obj/effect/golemrune/New)
The reaction that creates the rune was creating the rune in nullspace, it tried to use the loc in it's constructor, then it set the loc afterwards. Now it runs the constructor and such, THEN runs 'announce_to_ghosts()' after it is assigned a loc.
I've also changed src.loc.name to get_area(src) so instead of "A golem rune was created in area Floor " it says "A golem rune was created in Chemistry."
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5597 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-22 02:54:16 +00: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
632cad1044
observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-21 18:47:03 +10:00
e15c63d100
-New chicken sprites! Other minor tweaks to chicken code, slows them down some and notches the lay rate back a bit.
...
-Fixes invisible cane inhands.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5595 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-21 06:02:30 +00:00
c8a15aef72
Chickens will now lay a certain number of eggs per wheat fed to them. This changes the process from a passive one that happened regardless of user input to an active one that requires conscious effort. Bkaw.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5589 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-20 20:49:02 +00:00
3e6283403f
cleanup of alt titles handling, made sechuds able to see icons for the real job if players have an alt title, made custom job titles via id computer into alt titles
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-21 04:55:02 +10:00
Erthilo