cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,242 Commits 5 Branches 0 Tags
a8d7e5275aa84eb78cbed4abb0055a8edfeca22d
Commit Graph

8656 Commits

Author SHA1 Message Date
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
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
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
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
sieve32@gmail.com
d64186ec9b -Now instead of just giving an angry message, any living mob with a client and the nuke disk that hits a transition on Z1 on them will have their momentum reversed, effectively sending them back where they came from. (Dead and clientless mobs still have the disk deleted from them) 
Fixes Issue 1183

-Most game-specific messages now print to all non-new_player mobs instead of the world, round-end reports are unchanged but request consoles and other announcements will not be heard by people in the lobby any more
Fixes Issue 1158

-Tweaked the temperature resistance of mechs to be more inline with current fires. Most mechs protect almost as well as a full fire suit, and the firefighter mech is just over 2x more effective
Fixes Issue 1027

-False-walls can no longer be fixed when on top of a dense turfs
Fixes Issue 1196

-Tweaked how damage was read for CPR and self-examining so you can't perform CPR on yourself at 100 damage
Fixes Issue 1202

-Made stun-glove construction use the cable/Use() instead of just amount-2, so you can no longer get 0 amount coils
Fixes Issue 1206

-Glass reagent containers and droppers now log attacks like syringes do, with the list of reagents
Fixes Issue 1234

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5508 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-10 19:07:02 +00:00
aranclanos@hotmail.com
692fc1b95a Runtime fixes for the spells conjure carp and conjure creatures, I updated their paths to the correct ones. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5507 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-10 17:32:41 +00:00
aranclanos@hotmail.com
e6ac192056 Runtime fix for trying to blow traitor borgs, I just changed a usr for a src whooooo 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5506 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-10 16:35:55 +00:00
GauHelldragon
a059e3b32c Farmbots! 
Adding farmbots again. They water, weed and fertilize
Build them by using cyborg arm on a water tank, then plant anaylzer, mini-hoe, bucket, and then prox sensor
 2013-01-10 02:59:40 -08:00
Chinsky
cceb81d495 Added wearable toddler. 2013-01-10 14:23:45 +04:00
Chinsky
c15b5aee0f Changed way dripping blood works a little. 
Now there could be 5 drips on a tile.
Drip #6 makes it into blood puddle.
Now if you bleed out you won't lie in 3 drops of blood, bubt in proper puddle
 2013-01-10 14:23:01 +04:00
Chinsky
08b52b0f04 Added alternative uniform for Security officers and Security armor vest. 2013-01-10 14:21:22 +04:00
Chinsky
c29566a5bb Fix for issue #2103 
Now vines unbuckle all captured in the mobs on death.
 2013-01-10 03:10:12 +04:00
aranclanos@hotmail.com
4cfb6d7d4e Runtime fix for trying to set the mental status of a person without medical record to "stable". I'm pretty sure it was a typo. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5505 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-09 21:22:06 +00:00
aranclanos@hotmail.com
daae5b6a9d Runtime fix for building AIs without a brain 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5504 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-09 20:51:31 +00:00
aranclanos@hotmail.com
334347b4bb Runtime fix for slimes trying to eat a mob that doesn't exist anymore 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5503 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-09 19:17:28 +00:00
aranclanos@hotmail.com
836f0e2584 Runtime fixes for admins using simple transformations on ghosts, and the mobs getting dna = null 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5502 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-09 18:21:39 +00:00
petethegoat@gmail.com
7500ac50f8 Committing two proposed commits by Malkevin: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11499 & http://forums.nanotrasen.com/viewtopic.php?f=16&t=11717 
Owl mask is now a gasmask.

Adds the missing icons for the arrest statuses of Parolled and Released, as well as a little blinking icon for chemical implants to hud.dmi
And adds them to hud.dm so they show in game also.

Updated the changelog.

Path change:
/obj/item/clothing/mask/owl_mask > /obj/item/clothing/mask/gas/owl_mask

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5501 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-09 12:53:42 +00:00
Chinsky
2e75059c3a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-09 12:45:04 +04:00
Chinsky
7fea186d64 EMP now will have !!FUN!! effects on implants. 
Affected implants:
-Explosive
-Death alarm
-Tracking
-Chemical

Also added new sound for implant activation.
Fixed derp in implant surgery.
 2013-01-09 12:43:22 +04:00
petethegoat@gmail.com
21b8f77d2a Fixed capitalisation on alien ventcrawl. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5500 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-09 00:32:42 +00:00
Kortgstation@gmail.com
3cb3c1ea0d Fixed being able to remove canremove = 0 items by trying to place an object on a person. 
Fixed more adamantine golem icons.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5499 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-08 23:15:28 +00:00