Commit Graph

17074 Commits

Author SHA1 Message Date
Walter0o 868759c93c computer3 remote view exploit fix
you could look at any atom for a tick.
could need improvement, does not check camera network at the moment,
because of the costly and temporary nature of the getter proc.
2014-08-03 15:00:25 -04:00
Walter0o 63392fab2d prisoner computer3 topic exploit fixes
fun : you could trigger grenades this way
2014-08-03 15:00:07 -04:00
Walter0o d92d7fb30a refining the clipboard topic checks 2014-08-03 14:59:53 -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
ZomgPonies a1a866d8e4 Revert "Fixes #5202"
This reverts commit a94761c5c4.
2014-08-03 14:59:13 -04:00
Walter0o fb7d02ee1f folder exploit fixes
Conflicts:
	code/modules/paperwork/folders.dm
2014-08-03 14:58:04 -04:00
Walter0o 3cc234cb03 clipboard exploit fixes 2014-08-03 14:57:13 -04:00
Zuhayr a94761c5c4 Fixes #5202 2014-08-03 14:56:53 -04:00
Zuhayr a8ae953579 Fixes #5630
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2014-08-03 14:54:45 -04:00
Zuhayr 20e6a01bb8 Fixes #5737 2014-08-03 14:53:45 -04:00
Bone White 9d664e9d1a Longer time taken to drill a pipe through a r_wall
Added a message too to the driller that it's going to take a while.
2014-08-03 19:28:48 +01:00
Bone White e3ca0f3f6e Allows the sliding of pipework along floors
Allows pipes to be slid along the floor, not only does this make laying
pipes easier, but you can now lay pipes under machinery without having
to remove them.
2014-08-03 19:23:21 +01:00
ZomgPonies b52a1b76a6 Merge pull request #352 from VampyrBytes/master
Machine people fixes
2014-08-03 14:03:51 -04:00
ZomgPonies 65f099b0c9 Merge pull request #351 from Bone-White/master
Allows the insertion of pipework into walls
2014-08-03 14:03:42 -04:00
Bone White 0bf9f46d1f Allows the insertion of pipework into walls
Pipes will be visible above the wall, allows for easier atmos repairs.
Atmos pipes installed this way can be unwrenched as normal.  Walls are
unaffected.
2014-08-03 11:36:39 +01:00
ZomgPonies cb441541f5 Added vampire HUD 2014-08-03 01:27:36 -04:00
Zuhayr 2c6c68b7aa Adjusted gas exude code.
Conflicts:
	code/game/machinery/hydroponics.dm
2014-08-02 22:37:05 -04:00
Zuhayr 6b51c43694 Adjusted process_reagents() so hydro trays are refillable with water and nurients when the tray is dead/empty. 2014-08-02 22:34:33 -04:00
Zuhayr ceb7cb9419 Reapplying some fixes that I think DM may have saved over, whoops. 2014-08-02 22:34:17 -04:00
Zuhayr 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
MrSnapwalk 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
PsiOmega 93898942f3 Is a little convoluted but this removes the last X: use in supermatter.dm 2014-08-02 22:12:46 -04:00
PsiOmega db6b0dbfcc Recasts objects to avoid usage of : 2014-08-02 22:12:29 -04:00
PsiOmega 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
PsiOmega f4be5b9afb Fixes #5839 by making the comb slightly more gender aware. 2014-08-02 22:11:57 -04:00
ZomgPonies ca5f2103f0 Removing the gaz stuff from botany 2014-08-02 22:09:41 -04:00
Zuhayr 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
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
SamCroswell 877a48f982 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-08-01 10:03:35 -04:00
SamCroswell a860241f96 Rigged up unused warning stripe decals, we no longer require specific turfs for warning stripes. 2014-08-01 09:57:57 -04:00
PsiOmega 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
Zelacks 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
Rob Nelson 61cba51494 Vending machine href exploit fix
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/vending.dm
2014-08-01 01:12:25 -04:00
PsiOmega 1b2631f86b Adds proximity check to prevent telekinetic taping of doors. 2014-08-01 01:05:04 -04:00
JimTheCactus fd5e0e289c Tidy up and use more sane defaults. 2014-08-01 01:04:12 -04:00
JimTheCactus ddf8fdc06b Modified function such that the atom isn't used in the defaults.
This caused the routine to crash when the atom didn't have an icon or was null.
2014-08-01 01:03:59 -04:00
mwerezak 9cad0d5a16 Allows pod to be launched if shuttle leaves early 2014-08-01 01:00:21 -04:00
mwerezak 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
Atlantiscze 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 Nelson 8fd4346dc3 Plasmen bogfix
Conflicts:
	code/ZAS/Plasma.dm
2014-07-31 19:03:35 -04:00
Rob Nelson 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
ZomgPonies 5b5af35dc9 UI fixes for new AI photography 2014-07-31 17:43:28 -04:00
PsiOmega 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
PsiOmega 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
PsiOmega 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
JimTheCactus e83e99f5b0 Added handler for pixel stepping 2014-07-31 17:15:58 -04:00