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
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
Hubblenaut
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
JimTheCactus
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
JimTheCactus
01802cd5aa
Made camera render turf effects.
2014-07-31 17:05:32 -04:00
JimTheCactus
3709e60979
Ported nearest-neighbor scaling from TG
2014-07-31 17:05:18 -04:00
JimTheCactus
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
JimTheCactus
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
JimTheCactus
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
mwerezak
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
Zuhayr
95b069b7d4
More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues.
2014-07-29 14:44:34 -04:00
Zuhayr
a7ffa5747b
Fixed diona pods being mutable, fixed a few other tweaks, added cuttings.
2014-07-29 14:44:15 -04:00
ZomgPonies
8c228fcc87
Trying to stop facehuggers being badass
2014-07-28 21:56:27 -04:00
ZomgPonies
be8da47760
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-07-28 13:52:51 -04:00
ZomgPonies
fe5db3f538
Merge pull request #335 from Bone-White/master
...
Spec Ops Shuttle Computer Access Fix
2014-07-28 13:52:25 -04:00
Zuhayr
0e3e46e310
Fixes some transposed values.
2014-07-28 13:49:37 -04:00
Zuhayr
d1059b488b
Bevy of newhydro fixes.
...
Conflicts:
code/game/machinery/vending.dm
code/modules/projectiles/guns/energy/special.dm
icons/obj/hydroponics.dmi
2014-07-28 13:49:18 -04:00
Loganbacca
0affd2b7c8
More train fixes
...
- No passing plastic flaps
- Only human based mobs can board trains
- Adjacent checks for exiting vehicles
- Cleaned up as many direct loc moves as possible
- Places removed cells in the removers hand
2014-07-28 13:34:50 -04:00
Bone White
d15d6bb742
Minor surgery typo "exposing the brain help within"
...
Fixed a typo in organ_external
2014-07-27 21:37:33 +01:00
JimTheCactus
7304682f62
Changes check to an isnull rather than a truth test
...
This allows the client to detect the difference between a blank and someone pressing cancel.
2014-07-27 14:44:05 -04:00
JimTheCactus
b23f424ed1
Added check for blank on name entry
...
Since cancel just returns a blank this checks for that and doesn't raise an error.
2014-07-27 14:43:53 -04:00
ZomgPonies
9969b6d33e
Jukebox radio fixes
2014-07-27 13:49:50 -04:00
Rob Nelson
ac0c864603
Added and completed radio broadcasting system.
...
Conflicts:
code/modules/media/broadcast/transmitters/broadcast.dm
code/modules/media/jukebox.dm
icons/obj/radio.dmi
maps/tgstation.dmm
2014-07-27 12:46:46 -04:00
Bone White
0aebd8afa3
Spec Ops Shuttle Computer Access Fix
...
Gives the shuttle controller the correct access for the ERT
2014-07-27 17:30:22 +01:00
ZomgPonies
d61776a1c3
Merge pull request #333 from SamCroswell/master
...
Minor Map Fixes
2014-07-27 12:00:40 -04:00
ZomgPonies
c1801306a7
Merge pull request #331 from VampyrBytes/master
...
fix for customizable foods
2014-07-27 12:00:09 -04:00
ZomgPonies
89508f7e7f
Merge pull request #334 from Bone-White/master
...
Advanced Medical Hud Glasses (medihud + flash protection)
2014-07-27 11:58:42 -04:00
Bone White
abde4759ae
Advanced Medical Hud Glasses (medihud + flash protection)
...
For blueshield and brig physician. Also added the item to blueshield
locker. Item allows medical record viewing/editing. I have _NOT_ added
security record viewing/editing.
2014-07-27 16:06:35 +01:00
SamCroswell
ace4d63a8f
Minor change, testing some GH commands.
2014-07-27 08:47:29 -04:00
ZomgPonies
48be906056
Merge pull request #328 from SamCroswell/master
...
Added an admin verb to toggle ERTs
2014-07-26 19:15:57 -04:00
ZomgPonies
d67de71db9
I had removed volatile_fuel, but it somehow came back. Fixed again now.
2014-07-26 19:06:18 -04:00
SamCroswell
075ad2a943
Added an admin verb to toggle ERTs
2014-07-26 18:04:33 -04:00
ZomgPonies
ce856e1f8e
Better fix
2014-07-26 17:09:49 -04:00
ZomgPonies
4c1d82d5d4
Blobs break grav gens means no grav
2014-07-26 17:04:12 -04:00
ZomgPonies
7840276f63
We use a different methodology for respawning as NPCs.
2014-07-26 14:50:24 -04:00
Zuhayr
c0ba021bcd
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
...
Conflicts:
code/datums/supplypacks.dm
code/game/machinery/hydroponics.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/reagents/reagent_containers/spray.dm
maps/tgstation2.dmm
2014-07-26 14:03:46 -04:00
Zuhayr
5a773dba35
Fixed seeds not showing up properly in the vendor.
2014-07-26 13:55:36 -04:00
ZomgPonies
a830973b74
Commented out some vg procs while I wait for info from Nexis
2014-07-26 12:59:29 -04:00
Rob Nelson
845a90b02c
More work on things.
...
Conflicts:
baystation12.dme
2014-07-26 12:45:28 -04:00
ZomgPonies
99c96c0c9c
Let's stay up to date with Zuzu's PR shall we?
2014-07-26 12:04:54 -04:00
Jarcolr
ff71c6f097
Fixes #5691
...
Chef >> Chefhat
2014-07-26 11:28:15 -04:00
