Commit Graph

17074 Commits

Author SHA1 Message Date
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
JimTheCactus
ba3241fadf Merged getFlatIcon rendering from tgstation
Based on tgstation #2826. This is not all of it though.
2014-07-31 17:03:05 -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
9ac64815a1 Goddamnit 2014-07-30 00:21:26 -04:00
mwerezak
8843b7f757 Sound fixes
Conflicts:
	code/game/sound.dm
2014-07-30 00:19:56 -04:00
PsiOmega
2436478804 An Odysseus with patients now bypass mech movement-overrides. 2014-07-30 00:17:48 -04: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
071bfd4629 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-28 22:27:41 -04:00
ZomgPonies
8c228fcc87 Trying to stop facehuggers being badass 2014-07-28 21:56:27 -04:00
ZomgPonies
5fa14b8391 Merge pull request #342 from Robertha89/patch-1
Update vampire.dm
2014-07-28 17:20:18 -04:00
ZomgPonies
17da01a00b Merge pull request #341 from Robertha89/patch-4
Update cult.dm
2014-07-28 17:20:04 -04:00
ZomgPonies
784297b39b Merge pull request #340 from Robertha89/patch-3
Update changeling.dm
2014-07-28 17:19:59 -04:00
Robertha89
be32d28719 Update cult.dm
Add Security Pod Pilot, Nanotrasen Recruiter and Magistrate where appropriate.
2014-07-28 23:09:09 +02:00
Robertha89
ca6e85defa Update changeling.dm
Add Security Pod Pilot, Nanotrasen Recruiter and Magistrate where appropriate.
2014-07-28 23:09:06 +02:00
Robertha89
ecbd008112 Update traitor.dm
Add Security Pod Pilot, Nanotrasen Recruiter and Magistrate where appropriate.
2014-07-28 23:09:02 +02:00
Robertha89
a4680ac5c3 Update vampire.dm
Add Security Pod Pilot, Nanotrasen Recruiter and Magistrate where appropriate.
2014-07-28 23:09:01 +02:00
ZomgPonies
75c691f112 Fix jackboot sound 2014-07-28 14:17:48 -04:00
ZomgPonies
be8da47760 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-28 13:52:51 -04:00
ZomgPonies
d76c95d435 Merge pull request #338 from VampyrBytes/master
fixes #295
2014-07-28 13:52:37 -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
PsiOmega
21a9d92930 Adds a lost AltClick click-through for the AI. Makes it possible to clear a turf alt-leftclick selection. 2014-07-28 13:35:40 -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
PsiOmega
45bcd41b9d Area naming consistency
Changes area name from "supply shuttle" to "Supply Shuttle" to match the casing of other areas.
2014-07-28 13:34:09 -04:00
DJSnapshot
006365d815 now you can hear next to you in space!
Conflicts:
	code/game/sound.dm
2014-07-28 13:33:31 -04:00
DJSnapshot
f52ece0c1d Big nerf and cleanup of 3D sound. should fix most of #5789
Conflicts:
	code/game/sound.dm
2014-07-28 13:28:23 -04:00
ZomgPonies
98963c336f Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-28 13:24:44 -04:00
PsiOmega
ea378b3bb5 Attempts to ensure that the captain (or the head loyalist to be precise, whomever he might be) is not a candidate for the directives.
Conflicts:
	code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
	code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
2014-07-28 13:24:38 -04:00
alex-gh
5b75ca3a11 Possibly improved /turf/simulated/Entered() performance 2014-07-27 23:11:49 +02: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
PsiOmega
6580012663 A sensor which registers mechs and trains attempting to pass by and, if necessary, blocks their movement.
If enabled, detects mechs/trains and blocks their movement if they are coming from any of the directions set by dir. Can currently only be enabled/disabled by radio command and airlocks are updated to utilize this.

The current setup allows mechs to move through airlocks during normal cycles, which for example lets Odysseus out to save lives.
Once a shuttle docks however, the sensors are enabled to prevent boarding.

If blocked, players receive a simple message stating that their command has been overridden.
2014-07-27 14:43:11 -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