Commit Graph

11962 Commits

Author SHA1 Message Date
ZomgPonies
74ecd392df Fix Grey whitelist bug 2014-02-16 07:30:55 -05:00
Incoming
6979765adb rerebalanced the SoC after running the odds
Conflicts:
	code/modules/projectiles/projectile/magic.dm
2014-02-16 05:47:17 -05:00
Incoming
d1cbeffbb1 Animate statues in magic stuff/Staff of Change rebalance
Adds animate statues to the Staff of Change pool of mobs
Adds specific synergy between flesh to stone and the staff of animation where if you animate your statue'd people they'll turn to animated statues controlled by the victim who are instructed not to dunk the wizard.

Splits the "animal" sub pool in the Staff of Change into "Beast" and "Helpless Animals" to help raise the odds of the former against the latter. Changed odds will be reported in a comment to follow.
2014-02-16 05:44:51 -05:00
Giacomand
0410d0ac49 Just some general polishing for the statue mobs.
Statue mobs can't change their direction while seen.
Lowered the range for flickering lights.
Lowered the cooldown for blinding people, added user feedback when the spell is used.
The blindness spell will affect people within objects.
2014-02-16 05:44:30 -05:00
Incoming
917370a608 Jay Owen demands that this pull be merged.
Crush a can for Jay Owen.

He has leukemia, please crush a can for Jay Owen.

His only wish is to see a can crushed live in our game.

Sprites by Nienhaus

Conflicts:
	code/game/objects/items/trash.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	icons/obj/janitor.dmi
2014-02-16 05:42:55 -05:00
Rob Nelson
71c07e208a Improved creature AI and random mob spawning in caves.
Also equipment lockers.

Conflicts:
	code/game/objects/items/weapons/cards_ids.dm
	code/modules/mining/materials.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/ores_coins.dm
	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/guns/energy/special.dm
	compare_report_tg.txt
	icons/obj/device.dmi
	icons/obj/mining.dmi
	icons/obj/vehicles.dmi
	maps/tgstation.2.1.0.0.1.dmm
	maps/vgstation1.0.0.dmm
2014-02-16 04:40:18 -05:00
Rob Nelson
6ad3ca77f1 New stuff for mining
Conflicts:
	code/game/mining_surprise.dm
	code/game/objects/structures/wizmobile.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/minerals.dm
	compare_report_tg.txt
	icons/obj/mining.dmi
	icons/turf/walls.dmi
2014-02-16 03:54:39 -05:00
Rob Nelson
4017704032 Quick fix from /tg/ for cyborgs. 2014-02-15 15:36:26 -05:00
Rob Nelson
08816a6b54 Buff superior welding goggles. 2014-02-15 15:36:06 -05:00
Rob Nelson
7b7cfb605d Comm console is now NanoUI. Fixes github #489, hopefully.
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/nano/nanoui.dm
2014-02-15 15:33:45 -05:00
ZomgPonies
bd688b5382 Fucking byond vars 2014-02-15 13:04:57 -05:00
ZomgPonies
31c435f5cf Merge pull request #157 from alex-gh/diona_nerf
Dionas now require more light to heal, being in darkness causes more dam...
2014-02-15 12:39:56 -05:00
ZomgPonies
60abc446db Merge pull request #158 from SamCroswell/master
/TG/ Card Port
2014-02-15 12:39:49 -05:00
ZomgPonies
7a54bb3b24 Merge pull request #159 from alex-gh/fireex_nerf
Nerfed firing items from fire extinguishers, they now do double the dama...
2014-02-15 12:39:41 -05:00
ZomgPonies
ce68d107e3 Merge pull request #160 from alex-gh/bs12_fixes_optimizations
Fixes and optimizations cherry picked from BS12
2014-02-15 12:39:30 -05:00
alex-gh
a496d709f3 Added 2 new AI icons by Wisewill 2014-02-14 17:06:58 +01:00
Ccomp5950
bf94d31642 RP-revconvert bugfix
Now only humans that are logged in, alive, and not already a revolutionary (no special_role) show up in the list.
Instead of EVERY mob type (simple_animals, borgs, etc.)
2014-02-14 14:34:49 +01:00
Loganbacca
f60e7c6488 Fix handcuff resist - layer bug
Fixes #4324

Resisting out of handcuffs was leaving the handcuffs layer set to 20 (over top of the UI).
Changed it to use the drop_from_inventory() proc so it handles the drop event correctly.
2014-02-14 14:32:28 +01:00
Loganbacca
078e5af528 Fix item drop layer bug
Similar to the handcuff resisting layer bug.

When removing an item from your inventory that has associated inventory slots, items that were dropped from the extra inventory slots would be dropped with incorrect layer variables (set to 20 so they were rendered over the UI).
Now when the extra items are dropped, it calls the drop_from_inventory() proc, which correctly changes their layer back.
2014-02-14 14:32:05 +01:00
alex-gh
9aaf0b8a5c fixed unfinished merge 2014-02-14 14:22:39 +01:00
Zuhayr
5ada6ea4cc Changed world loop to all_objective loop in cryopod check. Added all_objective add/remove procs to datum/objective.
Conflicts:
	code/game/machinery/cryopod.dm
2014-02-14 14:19:35 +01:00
alex-gh
4776dfd94f Telebaton now only stuns if it actually hits. 2014-02-14 14:13:03 +01:00
Zuhayr
6464f04c88 Fixes #3907 2014-02-14 14:03:13 +01:00
Zuhayr
151e9f6128 Discovered/fixed a division by zero error for standing on the supermatter core. 2014-02-14 13:58:53 +01:00
Zuhayr
438e48a5c1 Fixes #4306 (When a head goes into cryo storage during Rev, a random crewmember is chosen as a target instead.)
Conflicts:
	code/game/machinery/cryopod.dm
2014-02-14 13:56:33 +01:00
Zuhayr
85b59532fe using a welder with already damaged eyes no longer causes you to go blind
Conflicts:
	code/game/objects/items/weapons/tools.dm
2014-02-14 13:48:46 +01:00
alex-gh
0f57ef70ca Nerfed firing items from fire extinguishers, they now do double the damage compared to throwing them normally 2014-02-14 13:22:34 +01:00
Segrain
0568a0d3f2 Fix for unlocking exploit. 2014-02-14 12:07:56 +01:00
Segrain
dd1f5f1546 Fix for unpinning humans. 2014-02-14 12:07:30 +01:00
Ccomp5950
0b7e70a293 Bugfix: AI Camera light toggle
Fixes #3676

Before:  Toggling would get stuck where it wouldn't toggle the camera until you reset your view.

After:  Camera light toggles, you have to toggle off before turning on a new camera light though.
2014-02-14 12:03:52 +01:00
Ccomp5950
39bfcc1e7a Code effeciency project: handle_embedded_objects
Before:  EVERYTIME someone moved their character this proc would be called and loop through every organ looking for implanted items to see if it needs to apply damage.

After:  We create a flag that is set when an item embeddes, only when that flag is set do we do that loop through organs upon movement.  Also every 10 ticks while that flag
is set we will check to see if we need to unset it.

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
2014-02-14 12:02:19 +01:00
Ccomp5950
ca75160d6a People in lobby won't see PDA messages. 2014-02-14 11:54:32 +01:00
Ccomp5950
1c9271d218 Code effeciency project: Sun datum
Because of the wrong direction of this sign, every single solar array was being checked for occlusion every tick.

This should fix that right up.

Trackers set to update their angle only when the sun does.

Solar panels set to calculate occlusion every minute (was every tick (though thought to be set to every 6 minutes (36 degrees)), now checks every 6 degrees of sun movement or so)
2014-02-14 11:54:08 +01:00
Ccomp5950
2655c9b341 pAI messenger bugfix.
pAI has to be a special little snowflake and have it's own messenger proc instead of letting a AI-PDA handle it.

So, updated it with the newest tnote variable functionality so it can participate.
2014-02-14 11:53:10 +01:00
SamCroswell
bfd0ee6088 Added traitor item cards 2014-02-12 23:34:16 -05:00
SamCroswell
3634ff942b /TG/ Cards Ported, new card deck added 2014-02-11 23:22:30 -05:00
alex-gh
278f241133 Dionas now require more light to heal, being in darkness causes more damage 2014-02-12 01:14:26 +01:00
ZomgPonies
2c9dee38cb Merge pull request #155 from alex-gh/revolver_ck
Revolver conversion kits now modify revolvers without catastrophic failu...
2014-02-11 18:50:08 -05:00
ZomgPonies
3d4dd919c7 Merge pull request #156 from alex-gh/halloss_fix
halloss now makes you slower instead of faster
2014-02-11 18:49:56 -05:00
alex-gh
3cc986206c halloss now makes you slower instead of faster 2014-02-11 13:22:36 +01:00
alex-gh
e0d84dba7e Revolver conversion kits now modify revolvers without catastrophic failure chance 2014-02-11 12:10:09 +01:00
Ccomp5950
4ae2cd974b Ghosts can see PDA messages. (Redo: PR #4065 lost in merge) 2014-02-11 03:00:04 -05:00
ZomgPonies
f30cd8e96b Some statue tuning 2014-02-11 02:45:36 -05:00
Giacomand
2305f8551c The statue will call dust() when gibbed.
Increased the range of blind() so mobs just outside his can_be_seen() check won't stop it from blinding them.
Added a client check for AI stuff.

Conflicts:
	baystation12.dme
2014-02-11 02:26:52 -05:00
Giacomand
97e5f285d2 Changed their name and description so they almost match with the ordinary statues. 2014-02-11 02:26:04 -05:00
Giacomand
e9d4226480 Fixed statues trying to attack mice behind walls.
Buffed their speed and damage.
Reduced their vision range a bit.
Statues will now attack nearby mobs when after a target.
2014-02-11 02:25:46 -05:00
Giacomand
d3f086e942 Adds a new statue hostile mob!
This hostile mob is very much like other monsters that move/kill you when you don't look at them.
This mob is also designed to be player controlled and has spells to get around the 360 vision problem, such as flickering lights and causing people around it to go blind for a short duration.

CANPUSH is now used by simple_animals
Added 4 directional sprites for the statue.

Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2014-02-11 02:25:10 -05:00
ZomgPonies
27950d0542 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-02-10 07:08:48 -05:00
Loganbacca
f4eb9aea73 Bullet inscriptions
- Can inscribe text into bullets by using a screwdriver on a bullet casing
- Does not work on non-metal type bullets (i.e. rubber bullets, beanbags, stunshots, etc)
- Added weakbullet subtypes "rubber bullet" and "beanbag" with appropriate names

Conflicts:
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/projectile/bullets.dm
2014-02-10 07:07:49 -05:00
Ravensdale
5eab43b3d2 Tweak APC self-naming so they read better when examined or interacted
with. Thanks Sky for the suggestion and Mloc for the why.
2014-02-10 07:02:18 -05:00