cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 17:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,268 Commits 74 Branches 23 Tags
a5c1cf781acb30a69a3a6eaff2d89c4ce54f0333
Commit Graph

8673 Commits

Author SHA1 Message Date
Cael Aislinn
a5c1cf781a Merge pull request #2185 from CIB/feature 
Autopsy scanner fixes
 2013-01-16 17:57:35 -08:00
Cael Aislinn
f472e07cc1 Merge pull request #2194 from comma/master 
Surgeray
 2013-01-16 17:57:05 -08:00
Chinsky
69e06802ab Fixed issue #2158 
Now shutters will work with crowbar without asking.
 2013-01-16 22:09:03 +04:00
Chinsky
a2073134b3 Fixed runtimes in airflow. 2013-01-16 22:05:31 +04:00
Cael Aislinn
1f69e9a4f8 Merge pull request #2189 from GauHelldragon/bleeding-edge-freeze 
Re-ticking farmbots.
 2013-01-15 17:27:05 -08:00
MrYeti
7ba4df4462 Added Purple Gloves 2013-01-15 17:44:23 -05:00
GauHelldragon
85c9431aa4 Merge branch 'bleeding-edge-freeze' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	baystation12.dme
 2013-01-15 13:59:10 -08:00
cib
cdda38b6be More fixes for issue #2153 
High/low body temperature damage now leaves an autopsy message.
 2013-01-15 21:23:03 +01:00
cib
aff12feaaa More fixes to autopsy scanner, issue #2153 
- Scanner will now print data even when only time of death is available.
- Scanner will reset chemtraces on new patient.
 2013-01-15 21:14:06 +01:00
cib
4773361f64 Proper fix for the projectile runtime. 
Adds projectile autopsy messages back. Partial fix to issue #2153
 2013-01-15 19:46:30 +01:00
Chinsky
99770a8792 Fixed autopsy scanner defines. 
Committing map changes for faux.
 2013-01-15 20:26:55 +04:00
Cael_Aislinn
a8d7e5275a removed unused WIP file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-16 00:20:05 +10:00
Cael_Aislinn
e423798b8d removed a bunch of unused files, moved amorphs and meme to workinprogress/cib 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-15 23:29:49 +10:00
Cael_Aislinn
70764ac039 tweaked some supply packs a bit, added formalwear and pizza supply packs, made supply packs organised and selectable by type in the order menu 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-15 23:20:00 +10:00
Cael_Aislinn
6b93cc9c91 added placeholder economic stuff (probably never finish it), added random system-wide events (which are announced at the newscaster when they occur) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-15 21:25:45 +10:00
Chinsky
0f561b141c Merge branch 'surgery' 2013-01-15 14:30:01 +04:00
Chinsky
6d830af37c Merge branch 'master' into surgery 
Conflicts:
	code/WorkInProgress/surgery.dm
	code/modules/mob/living/carbon/carbon_defines.dm
 2013-01-15 13:42:13 +04:00
Cael_Aislinn
dc42275ae2 bunch of new alt titles, based off forum and IRC suggestions 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-15 14:00:57 +10:00
Cael_Aislinn
e4db320f97 removed unused files, moved simple_animal/head 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-15 00:00:15 +10:00
GauHelldragon
b093f04310 Feature: Bang kitchen trays with rolling pin just like riot shield + baton 
The public demands it!!
 2013-01-14 05:49:39 -08:00
Cael_Aislinn
20cacd30de sanitize renaming id cards via computer and agent cards 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 23:44:16 +10:00
Cael_Aislinn
d532ec9712 add+fix missing files for jungle away mission, re-add missing atmos and security rigs, refactor and cleanup rigs 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 23:29:53 +10:00
Cael_Aislinn
8581932c57 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/objects/items/toys.dm
	icons/mob/back.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/weapons.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 22:14:46 +10:00
Cael_Aislinn
09a9c7458f runtime fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 21:46:12 +10:00
Cael_Aislinn
cf6aadef09 remove some unused files, tick barsigns.dm and removed duplicate definition 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 21:23:47 +10:00
Cael_Aislinn
1c9b04ec74 copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 21:07:16 +10:00
Jim "Apples"
c8032311b5 Merge pull request #2162 from comma/master 
EMP x Implants OTP... and lots of other things.
 2013-01-13 04:29:50 -08:00
Chinsky
7f84b415a8 Moved germ transferring and blood splatters in parent 'begin_step' of surgery steps. 2013-01-13 11:56:33 +04:00
Chinsky
c0fc8f965b Added doublecheck for disfigurement 2013-01-13 11:52:41 +04:00
Chinsky
3447c61e49 Moved surgery from WIP to modules, since it's not really that WIP anymore. 
Split one huge file into several smaller ones for readability.
 2013-01-13 02:11:06 +04:00
Chinsky
f22749df04 Merge branch 'adminstuff' 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2013-01-12 23:48:03 +04:00
Chinsky
b7d5c872a3 Merge branch 'ohgodsilly' 2013-01-12 22:50:54 +04:00
Chinsky
18a5554da5 Merge branch 'secfashion' 2013-01-12 22:50:22 +04:00
Chinsky
08160b5111 Added alternative security uniforms to wardrobes. 
Security armor vest now has different sprite.
 2013-01-12 22:48:18 +04:00
Chinsky
dc2f77ddd0 Merge branch 'cult' 2013-01-12 22:30:56 +04:00
Chinsky
2f70033ac0 Merge branch 'job' 2013-01-12 22:30:01 +04:00
Chinsky
8a3758af72 Morgue trays now can open in different direction depending on how they are placed. 
No way to rotate ingame though, mapping and badminning only.
 2013-01-12 09:32:08 +04:00
Cael_Aislinn
bdeb96b7e5 Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.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/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.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/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-11 22:12:31 +10:00
Jim "Apples"
02eef0a568 Merge pull request #2163 from GauHelldragon/bleeding-edge-freeze 
Farmbots! Adds new file farmbots.dm
 2013-01-11 02:47:51 -08:00
d_h2005@yahoo.com
2855cd6237 Fixes issue 1211 - Invisible toasts were due to a naming mismatch. (step it up kor) 
-New sprites for the border firelocks!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5514 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-11 05:58:21 +00:00
Cael_Aislinn
d4b3d19793 cleaned up a bunch of away missions, made only the peaceful-ish ones spawn, added my jungle map and susu's research labs map 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-11 14:52:43 +10:00
sieve32@gmail.com
b69e3962da -Fixed space travel, sorry about that. Implemented a list the wrong way so you got thrown back whether you had the nuke disk or not, and I changed it from just reversing momentum to actively pushing you away from the boundary, which also means that even if you get past the transition boundary, it will continue to push you back. 
Fixes Issue 1236

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5513 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-11 01:37:05 +00:00
Chinsky
a1163b5522 Fix for runtime in airflow for godmode mobs. 2013-01-11 04:55:31 +04:00
Chinsky
2c91523b84 Security belt now can hold taser, stunbaton and tape roll. 2013-01-11 04:43:15 +04:00
Chinsky
e55e8fc3a3 Added verb for admins to create additional job slot. 2013-01-11 04:22:05 +04:00
petethegoat@gmail.com
1aaee90154 Updating the conjure spell to just use paths instead of strings. 
Removed the needless Del() from event.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5512 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-11 00:08:17 +00:00
petethegoat@gmail.com
f27399bcd5 Added a new events system! 
The old one still exists, mainly so the associated admin buttons still work.
At some point I'll add a nice little panel for event stuff and remove the old procs.

event.dm is pretty well commented, and it should be pretty easy to figure it out.

Casualties of the change are space dust (which should probably be implemented separately if we want it back), the black hole event (which was awful), space ninjas (which didn't turn up), ionstorms (the non-admin ones sucked anyway) and CLANG, which I will probably add at some point, if no one else does first.
Also, I removed pierott's throat from the disease outbreak list. f that s.

Thanks to Sukasa and BS12, as my system is loosely based off of theirs.
Thanks Giacom for help with structuring and especially commenting this.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5511 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-10 23:45:57 +00:00
Chinsky
4f173c52a8 Good God, cult code is atrocious.... 
For now made all words into one list, instead of separate vars for each.
Brought back awesome Urist runes. Down with crayon doodles!

Need to look into making rune NOT check what rune it is EVERY TIME it is activated... making subclasses or some shit like that.
The more I stare in that code the louder screams in my head, maybe that's intended?
 2013-01-11 02:01:23 +04:00
entrian.tration@gmail.com
ba036675da Firedoors now more like window doors. They are see-through and only block movement in one direction. 
They probably need a new icon. The new one is kinda ugly and, since its red, may blend in with the fire alarm effect too much.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5509 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-10 21:14:34 +00:00
Chinsky
b5da64d10e Fixed eternal disfigurement (got quite spammy in fires) 2013-01-11 00:29:10 +04:00