Fox-McCloud
99bf49504a
LINDA Pressure Changes
2015-07-11 06:28:03 -04:00
Fox-McCloud
0dbea7621f
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
Fox-McCloud
4d04bb7750
Guts Moronic Phoron
2015-06-30 01:06:09 -04:00
Tigercat2000
a8702efd6b
BAYPORT: Duct Tape
...
This commit ports Duct Tape from bay, alongside a few other changes for
our own code.
Bay12 Features:
- You can tape paper to.. anything basically, like a sticky note.
Changes from Bay12:
- Tape is a stack now, and has 10 uses per roll.
- The guitar recipe now calls for 5 pieces of tape.
2015-05-17 14:11:25 -07:00
MrPerson
3d9fd8d6a0
Change holidays into datums
...
Holidays are now actual datums with procs and vars and everything.
Holidays run a proc called celebrate() when it's time to celebrate them.
Currently none of them do anything but that should change, wink wink.
Holidays can now run for more than a day. The important ones, april fools,
christmas, halloween, new years, and easter, all last at least a week.
The idea is so people can celebrate christmas in game without having to,
you know, actually play on fucking christmas. And also to put a time limit
on how long stuff like the annoying spookoween closet skeletons will stick
around so it doesn't overstay its welcome and become annoying as shit like
last year.
The event SS now allows more than 1 holiday to run at a time.
This matters for new years + christmas, easter + april fools, easter + 4/20,
and any holiday that can happen on friday the 13th.
The events get stored in a list that's only initialized if there's an active
holiday so testing for potential holidays is still pretty easy.
Added more easter dates so we won't have to add more until 2040.
The current batch run out in 2017.
:-------------PARACODE NOTES------------:
Tied to event process
Extra procs for holidays to be able to run special events alone
Admin manual-override functionality maintained and ported to new system
2015-05-15 20:52:39 -07:00
Sawu
d038a0710c
Adds spraycans, fixes lipstick, modifies scleaner
...
This commit does the following:
- Adds spraycans as a subtype of crayons.
- Slight crayon overhaul to make room for this
- Can spray graffiti, runes, and letters on floors & walls
- Can spray mobs and paint their face
- Fixes & overhauls lipstick
- Lipstick is now overlay and Blend() based.
- Also fixes a few bugs with the system.
- Updates paper code to accomodate for wiping off spraypaint as well
- Slight modification to space cleaner
- Space cleaner now cleans your face of lipstick and spraypaint
2015-04-15 17:19:08 -07:00
Artorp
7843fed4ce
Updates paperwork: Armory list
2015-03-02 17:59:22 +01:00
Markolie
672305e034
Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things
2015-02-22 22:12:11 +01:00
Markolie
982102a407
Standardize mutations
2015-02-22 19:04:43 +01:00
Markolie
9fedfc7c62
Switch copytext and sanitize proc
2015-02-20 22:17:13 +01:00
DZD
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -05:00
DZD
fbd9c367c0
NODROP flag addition & handling
...
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
Markolie
e7713a4662
Fax UI rework
2015-02-13 15:40:53 +01:00
Markolie
96cb55bab9
Fixes paper that spawns on the map breaking
2015-02-10 01:26:26 +01:00
DZD
bee904d99f
Paperwork NT Logo Fix
...
- Fixes the problem where the image for using [logo] in paperwork was
not appearing correctly.
2015-01-13 17:08:55 -05:00
Markolie
1f54e93239
Burnable photo, burn ash location fix
2015-01-06 02:17:14 +01:00
Markolie
73bf2003c3
Armory mechnical toolbox update
2015-01-06 00:45:02 +01:00
Markolie
4cca604423
Sechud for magistrate, armory inventory paper update
2015-01-06 00:01:20 +01:00
Markolie
38e709e4bd
Telescience crystal revert, supervisor access/PDA/headset fixes
2014-12-14 00:46:46 +01:00
Markolie
b8282b7cae
Blueshield/NT Rep/NT Rec updates
2014-12-10 06:09:06 +01:00
Markolie
a1a80c1a27
Minor fixes
2014-12-04 18:18:01 +01:00
Markolie
cb7676c139
Re-add stamp images, add more holopads
2014-12-03 02:53:26 +01:00
Markolie
0bf46a71b1
Map changes, bug fixes
2014-11-30 20:10:34 +01:00
Markolie
b66f3effae
Bug fixes, implements new copying/faxing system from Bay
2014-11-27 21:00:58 +01:00
Walter0o
0ac078ad46
derping derps
...
thanks to @mwerezak
2014-08-03 15:07:07 -04:00
Walter0o
d9884f054d
paper exploit fixes
...
i think my favourite part of this was
```var/obj/item/i = usr.get_active_hand()
if( ... && usr.get_active_hand() != i))```
2014-08-03 14:59:38 -04:00
Rob Nelson
f7b516a5ab
Shit catches on fire now
...
Conflicts:
code/ZAS/Fire.dm
code/game/objects/items/weapons/storage/bible.dm
code/game/objects/items/weapons/storage/boxes.dm
code/modules/mob/living/living_defines.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photography.dm
code/setup.dm
2014-07-18 06:32:15 -04:00
Chinsky
d37e54bf73
Added new BBCode tags, for tables and NT logo. Removes html support from paper.
...
Conflicts:
html/changelog.html
2014-05-28 08:49:24 -04:00
ZomgPonies
50d78cbd04
Fixing up customs with some standardized forms
2014-04-30 16:19:57 -04:00
Rob Nelson
d49e6d3bf4
Standardize CLUMSY
...
Conflicts:
code/game/jobs/job/civilian.dm
code/game/objects/items/weapons/defib.dm
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
Furlucis
9dedba21cf
Talisman icon fix
...
Makes talismans keep looking like talismans for more than a tick.
2014-01-11 00:04:09 -05:00
ZomgPonies
f254bda761
Allows burning paper
2013-12-10 03:02:09 -05:00
ZomgPonies
9d8dc3bf57
New Stamp Code + Map updates
2013-10-31 08:35:38 -04:00
Chinsky
e34d033cc9
Moved tag whitelist check to HELPERS.
...
Removed img tag from whitelist.
2013-02-12 20:43:22 +04:00
Chinsky
fea160d6f0
Merge branch 'master' into HTML
2013-02-12 19:39:00 +04:00
Chinsky
c175833b9c
Started working on making paper use HTML instead of only BBCode again.
...
Whitelisting system for tags.
Blacklist for words like 'java' and names of even triggers.
Might move to whitelist for those too, on Mini's suggestion.
2013-01-15 07:17:21 +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
petethegoat@gmail.com
f363948dc6
Committing some of SuperSayu's misc patches: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11671
...
* Smart fridge smartly shows (x5)(x10)(x25)(All) vend options based on quantity stored
* Gateway fix: When the away mission gate is calibrated, you will come out facing south. Matters somewhat when walking through in an exosuit. Also one pedantic text edit.
* Drink volume estimation:
* * Moved "half-full" to 26%-66% rather than 25%-49%
* * Moved "almost full" to 67%-90% rather than 50%-111% (1/.9)
Also removed /obj/item/weapon/directions and /obj/item/weapon/paperscrap.
They've been replaced by /obj/item/weapon/paper/crumpled and /obj/item/weapon/paper/crumpled/bloody.
Updated 2.1.0 and all away missions.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5497 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 20:58:31 +00:00
Cael_Aislinn
aae42d928a
Merge branch 'incremental_tg' r5200 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/global_lists.dm
code/__HELPERS/type2type.dm
code/__HELPERS/unsorted.dm
code/datums/datumvars.dm
code/datums/disease.dm
code/datums/organs/organ_external.dm
code/datums/supplypacks.dm
code/defines/obj.dm
code/game/area/areas.dm
code/game/atoms.dm
code/game/gamemodes/cult/cult_structures.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/hud.dm
code/game/jobs/access.dm
code/game/jobs/job/civilian.dm
code/game/machinery/alarm.dm
code/game/machinery/cloning.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/medical.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/objects/effects/decals/contraband.dm
code/game/objects/effects/signs.dm
code/game/objects/items/devices/PDA/PDA.dm
code/game/objects/items/devices/PDA/cart.dm
code/game/objects/items/weapons/photography.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/window.dm
code/game/sound.dm
code/game/verbs/ooc.dm
code/global.dm
code/modules/DetectiveWork/detective_work.dm
code/modules/DetectiveWork/evidence.dm
code/modules/DetectiveWork/footprints_and_rag.dm
code/modules/DetectiveWork/scanner.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminhelp.dm
code/modules/admin/verbs/adminpm.dm
code/modules/awaymissions/gateway.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/client/preferences.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/mint.dm
code/modules/mining/ores_coins.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/living/carbon/alien/alien.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/human_damage.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/living.dm
code/modules/mob/living/say.dm
code/modules/mob/mob.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/mob/new_player/login.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/mob/new_player/savefile.dm
code/modules/mob/new_player/sprite_accessories.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photocopier.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/setup.dm
code/unused/mining/datum_processing_recipe.dm
code/unused/powerarmor/powerarmor.dm
code/world.dm
html/changelog.html
icons/effects/96x96.dmi
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
icons/obj/hydroponics.dmi
icons/obj/items.dmi
icons/turf/areas.dmi
icons/turf/walls.dmi
maps/RandomZLevels/fileList.txt
maps/RandomZLevels/spacebattle.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-07 00:23:22 +10:00
rockdtben@gmail.com
169c96db1b
Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.
...
the .Cut() proc on a list will empty a list by default. This also will set the len to 0.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5465 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-04 15:11:06 +00:00
johnsonmt88@gmail.com
e7ebfae317
Another whack at the defines folder:
...
Removed defines/obj/toy.dm and moved the defines down to objects/items/toys.dm
Moved a big chunk of defines out of defines/obj/weapon.dm and into their respective .dm files.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5441 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-01 01:25:02 +00:00
Cael_Aislinn
31349fb7d3
Merge branch 'incremental_tg' r5067 into bs12_with_tgport
...
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)
Conflicts:
baystation12.dme
code/__HELPERS/type2type.dm
code/controllers/configuration.dm
code/datums/datumvars.dm
code/datums/helper_datums/getrev.dm
code/defines/obj.dm
code/game/gamemodes/events/black_hole.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/job.dm
code/game/jobs/job_controller.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/computer/card.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/turrets.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/turfs/turf.dm
code/game/verbs/ooc.dm
code/global.dm
code/modules/admin/IsBanned.dm
code/modules/admin/admin.dm
code/modules/admin/admin_memo.dm
code/modules/admin/admin_verbs.dm
code/modules/admin/holder2.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminpm.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/assembly/igniter.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/jobs.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/living.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photocopier.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/reagents/Chemistry-Machinery.dm
code/setup.dm
code/stylesheet.dm
code/world.dm
config/admins.txt
config/config.txt
html/changelog.html
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
icons/turf/areas.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-28 14:13:11 +10:00
GauHelldragon
2c47afc22e
Roboitems - Printing Pen
...
Allows service borg to rename paper. Click on pen to toggle between writing and renaming mode.
2012-11-28 03:03:20 -08:00
Chinsky
15abc757d3
Nullchecks. And one zero division.
2012-11-21 20:55:53 +04:00
petethegoat@gmail.com
b67262b32b
Ported over BS12 style cameras, which photograph a 3x3 area. It's fuckin radical.
...
Removed /obj/item/weapon/camera while I was at it (unused).
New cameras are in modules/paperwork/photography.dm.
Standardised folder and paper naming a leetle bit.
Added a new gamekit sprite, also from BS12.
Path changes!
/obj/item/weapon/camera_test > /obj/item/device/camera
Updated all maps with the path changes, excepting oldstation.dmm.
Updated the changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5116 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 23:41:37 +00:00
elly1989@rocketmail.com
4d9876fd65
Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').
...
>dd_replacetext and dd_replacetext_case are now replacetext and replacetextEx respectively.
>replacetext and replacetextEx works using strings only; it doesn't convert it into a list and then back into a string.
Fixes some dumb-dumbs in textlist and text2listEx
> "<" where there should be a "<="
> no else case for when the separator is longer than the text (causing empty lists to be returned)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4971 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 21:21:17 +00:00
Cael_Aislinn
548f60d25d
Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/gamemodes/events.dm
code/game/machinery/doors/door.dm
code/game/machinery/gateway.dm
code/game/objects/items/devices/flashlight.dm
code/game/sound.dm
code/global.dm
code/modules/admin/admin_verbs.dm
code/modules/awaymissions/zlevel.dm
code/modules/food/recipes_microwave.dm
code/modules/mining/mine_items.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/filingcabinet.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/handlabeler.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/paperbin.dm
code/modules/paperwork/pen.dm
code/modules/paperwork/photocopier.dm
code/modules/paperwork/stamps.dm
code/world.dm
html/changelog.html
maps/RandomZLevels/fileList.txt
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-15 23:17:18 +10:00
petethegoat@gmail.com
7d0dc98613
it keeps happening
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4859 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 19:54:56 +00:00
petethegoat@gmail.com
c4382905e5
Stamps are applied based on the icon_state of the stamp. Saves a switch.
...
They are also offset by a random amount.
Sosjerky is now properly named.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4857 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 18:55:09 +00:00
petethegoat@gmail.com
c4f9b43020
Moved para and sleepy pen defines out of weapon.dm.
...
Updated flashlight code a little.
Added inhand sprites for desk lamps.
Standardised modules/paperwork.
Decapitalised a bunch of mining items.
Slightly reverted update_icons.dm, so we're not looping through mutations more than we need to. Also, skeletons can now wear lipstick!
A few other things which aren't worth listing individually.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4855 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 14:37:28 +00:00