Commit Graph
7957 Commits
Author SHA1 Message Date
Walter0oandZomgPonies 0ac078ad46 derping derps
thanks to @mwerezak
2014-08-03 15:07:07 -04:00
ZomgPonies ebca6c5e61 Derpyderp 2014-08-03 15:06:47 -04:00
ZomgPonies 3facb45fa2 Derp 2014-08-03 15:05:22 -04:00
Walter0oandZomgPonies 2a0a7db434 cyborg topic exploit fixes
all kinds of fun here
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2014-08-03 15:04:48 -04:00
Walter0oandZomgPonies 6935180aee filing cabinet exploit fix
hooray for teleporting atoms to you via magic office furniture
2014-08-03 15:01:10 -04:00
Walter0oandZomgPonies d92d7fb30a refining the clipboard topic checks 2014-08-03 14:59:53 -04:00
Walter0oandZomgPonies 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
Walter0oandZomgPonies fb7d02ee1f folder exploit fixes
Conflicts:
	code/modules/paperwork/folders.dm
2014-08-03 14:58:04 -04:00
Walter0oandZomgPonies 3cc234cb03 clipboard exploit fixes 2014-08-03 14:57:13 -04:00
ZuhayrandZomgPonies a8ae953579 Fixes #5630
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2014-08-03 14:54:45 -04:00
ZuhayrandZomgPonies 20e6a01bb8 Fixes #5737 2014-08-03 14:53:45 -04:00
VampyrBytes b8bb0d1347 Machine people fixes
Disables overheating as most players reporting it makes machine people
unplayable

Fixes machine people's immunity to clone damage

Ensures machine people fall apart and consiousness transferred to
posibrain properly

Prevents robotic chest and groin being seperated which was leading to an
unrepairable body
2014-08-02 11:39:01 +01:00
ZuhayrandZomgPonies ceb7cb9419 Reapplying some fixes that I think DM may have saved over, whoops. 2014-08-02 22:34:17 -04:00
ZuhayrandZomgPonies 23ef5530de Changed hydro trays, fertilizer and syringes over to use the reagent procs.
Conflicts:
	code/game/machinery/biogenerator.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	maps/tgstation2.dmm
2014-08-02 22:33:47 -04:00
MrSnapwalkandZomgPonies 75b2ca2dd2 Psychiatrist/Psychologist update.
Conflicts:
	code/game/jobs/job/medical.dm
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
2014-08-02 22:23:39 -04:00
PsiOmegaandZomgPonies 93898942f3 Is a little convoluted but this removes the last X: use in supermatter.dm 2014-08-02 22:12:46 -04:00
PsiOmegaandZomgPonies db6b0dbfcc Recasts objects to avoid usage of : 2014-08-02 22:12:29 -04:00
PsiOmegaandZomgPonies 97372a0928 Fixes #5844 by only having a supermatter explosion affect living entities on the same Z-level. 2014-08-02 22:12:19 -04:00
PsiOmegaandZomgPonies f4be5b9afb Fixes #5839 by making the comb slightly more gender aware. 2014-08-02 22:11:57 -04:00
ZuhayrandZomgPonies 41ba5f318a More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues. 2014-08-02 22:05:10 -04:00
ZomgPonies 6e925c0e50 Merge pull request #350 from VampyrBytes/master
several fixes inc #233
2014-08-02 18:58:27 -04:00
PsiOmegaandZomgPonies e9cbca8aa5 Moves robot/drone specific New()-code into their respective classes, handling it using proc-overloads.
Also re-arranges robot init() code to prevent a runtime error when attempting to synch photos with the Master AI.

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2014-08-01 03:52:19 -04:00
VampyrBytes ea07c3b06b several fixes inc #233
Fixes icon creation issue in certain situations such as humanising
monkeys and cloning
Fixes humanized monkeys reverting to monkey name after being used for
cloning
Fixes humanized monkeys being made as human parent object instead of
human/race
2014-08-01 06:38:01 +01:00
ZomgPonies 0aa7f2013e Revert "Fixes #5827"
This reverts commit c3caf5c403.
2014-08-01 01:37:47 -04:00
ZelacksandZomgPonies ffacf4cc1f Alien Icon Fixed and revamped
Conflicts:
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	icons/mob/alien.dmi
2014-08-01 01:36:59 -04:00
mwerezakandZomgPonies 9cad0d5a16 Allows pod to be launched if shuttle leaves early 2014-08-01 01:00:21 -04:00
mwerezakandZomgPonies 929e3fb1fd Allows escape shuttle to scan IDs from within UI
Fixes #5592

Conflicts:
	nano/templates/escape_shuttle_control_console.tmpl
2014-08-01 01:00:09 -04:00
AtlantisczeandZomgPonies c3caf5c403 Fixes #5827
- Drones can now use .d to access Drone chat
- Cleaner and nicer check for dronechat, uses proper data from say.dm shortcut list.
- MISSING: .d alternative for "Russian localization" (Does anyone actually use that?)
2014-08-01 00:59:33 -04:00
ZomgPonies 1b2e61f3d0 Bugfixes 2014-07-31 19:42:07 -04:00
Rob NelsonandZomgPonies 8fd4346dc3 Plasmen bogfix
Conflicts:
	code/ZAS/Plasma.dm
2014-07-31 19:03:35 -04:00
Rob NelsonandZomgPonies 7832e1c26f PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN
Conflicts:
	.gitignore
	baystation12.dme
	code/_onclick/hud/screen_objects.dm
	code/modules/clothing/spacesuits/alien.dm
	code/modules/media/tapedeck.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	html/changelog.html
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/in-hand/in-hand_sync_report.txt
	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/tank.dmi
2014-07-31 18:58:49 -04:00
PsiOmegaandZomgPonies 03e7aaba81 Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.
Conflicts:
	baystation12.int
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
2014-07-31 17:38:14 -04:00
PsiOmegaandZomgPonies 6cbee92ec8 Expands the AI photo-camera so that it now has robot/cyborg support. Also implements DRY in practice.
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/wires.dm
	code/modules/mob/transform_procs.dm
	code/modules/paperwork/photography.dm
2014-07-31 17:31:23 -04:00
PsiOmegaandZomgPonies 0e82de2d39 Makes it possible for the AI to take and view images.
Conflicts:
	baystation12.int
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/transform_procs.dm
	code/modules/paperwork/photography.dm
2014-07-31 17:25:10 -04:00
JimTheCactusandZomgPonies e83e99f5b0 Added handler for pixel stepping 2014-07-31 17:15:58 -04:00
HubblenautandZomgPonies 13413635db Makes photos visible on bundles
Conflicts:
	code/modules/paperwork/paper_bundle.dm
	code/modules/paperwork/photography.dm
	icons/obj/bureaucracy.dmi
2014-07-31 17:15:19 -04:00
JimTheCactusandZomgPonies caa1922c20 Ported multi-turf behavior
This allows for layering that moves across tiles and enables alternate methods of enumerating the tile list (not used at present.)

Conflicts:
	code/modules/paperwork/photography.dm
2014-07-31 17:12:16 -04:00
JimTheCactusandZomgPonies 01802cd5aa Made camera render turf effects. 2014-07-31 17:05:32 -04:00
JimTheCactusandZomgPonies 3709e60979 Ported nearest-neighbor scaling from TG 2014-07-31 17:05:18 -04:00
JimTheCactusandZomgPonies 03b075ffd7 Modified to check every pixel
Checking only a few pixels had the tendancy to turn my charcter's head inside out when I was pointing directions other than south. Worse case is 1024 tests per object in the image. This test should be uncommon and the CPU usage is constrained by other factors.
2014-07-31 17:05:06 -04:00
JimTheCactusandZomgPonies ca458f502a Added workaround for non-directional icons with dir!=2
Several items in the map are set with a dir other than 2 but the icon associated with the item doesn't have directions. As such they misrender.

This resolves that specific issue, for the most part. Due to an odd behavior of Byond, when this circumstance occurs the icon proc produces a 32x32 image that is all alpha 0. At least that's what my testing suggests; it may be possible with large icons to encounter this as an issue and cause it to ignore an icon that should be reloaded from the default. However, this can't do any worse than the current software.

Conflicts:
	code/__HELPERS/icons.dm
2014-07-31 17:04:44 -04:00
JimTheCactusandZomgPonies 44649de675 Patched display and dealt with lying. 2014-07-31 17:03:17 -04:00
ZomgPonies f900578f25 Merge pull request #348 from VampyrBytes/master
Spacepod movement fix
2014-07-31 00:58:45 -04:00
ZomgPonies 742bc8c9b3 Merge pull request #345 from SamCroswell/master
Alien Tweaks, Commented Out Detomatix
2014-07-30 22:59:12 -04:00
SamCroswell 94dbad82a4 Alien Tweaks, Commented Out Detomatix 2014-07-30 00:53:56 -04:00
VampyrBytes 9b08b90ab0 Spacepod movement fix
Fixes spacepods not being able to move when the gravity generator goes
down
2014-07-30 05:46:47 +01:00
ZomgPonies 1bd2acf0d0 Revert "More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues."
This reverts commit 95b069b7d4.
2014-07-30 00:16:53 -04:00
mwerezakandZomgPonies ac3c812f28 Fixes chest not being coloured by necrosis
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
2014-07-30 00:16:16 -04:00
ZuhayrandZomgPonies 95b069b7d4 More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues. 2014-07-29 14:44:34 -04:00
ZuhayrandZomgPonies a7ffa5747b Fixed diona pods being mutable, fixed a few other tweaks, added cuttings. 2014-07-29 14:44:15 -04:00