6d3fb89130
Minor Change, committing before the undertaking
2014-02-23 15:58:07 -05:00
1358b11e46
ZAS overhaul
2014-02-22 23:10:37 -05:00
1ab8df4b13
Garbage collection fixes
2014-02-19 20:24:31 -05:00
5664784e31
Code effeciency project: Canister icon updates
...
Before: If a canister is hooked up to a connector port it's icons were being deleted and recreated every tick.
After: We store an update_flag that is a bitfield of the current icon and overlay states, and created a proc to check if it should change. If not, we don't mess with icons. Real simple.
Conflicts:
code/game/machinery/atmoalter/canister.dm
2014-02-19 19:37:13 -05:00
544c39f7c2
salvage
...
Conflicts:
code/game/jobs/access.dm
code/game/objects/items/weapons/cards_ids.dm
maps/tgstation.2.1.0.0.1.dmm
2014-02-16 10:38:52 -05:00
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
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
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
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
bd688b5382
Fucking byond vars
2014-02-15 13:04:57 -05:00
60abc446db
Merge pull request #158 from SamCroswell/master
...
/TG/ Card Port
2014-02-15 12:39:49 -05:00
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
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
9aaf0b8a5c
fixed unfinished merge
2014-02-14 14:22:39 +01:00
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
4776dfd94f
Telebaton now only stuns if it actually hits.
2014-02-14 14:13:03 +01:00
6464f04c88
Fixes #3907
2014-02-14 14:03:13 +01:00
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
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
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
ca75160d6a
People in lobby won't see PDA messages.
2014-02-14 11:54:32 +01:00
3634ff942b
/TG/ Cards Ported, new card deck added
2014-02-11 23:22:30 -05:00
4ae2cd974b
Ghosts can see PDA messages. (Redo: PR #4065 lost in merge)
2014-02-11 03:00:04 -05:00
963dbaee6b
Re-implementation
...
Makes the AI's voice more "AI"-like, adds a title screen, enables end of
the round sound-byte quips, and enables two additional songs during
pre-game
2014-02-08 23:47:06 -05:00
40090d5aa7
Merge pull request #150 from Fox-McCloud/Enemy-Communication-Intercepted
...
Enemy communication intercepted
2014-02-08 20:47:12 -05:00
ceb322c1d0
Merge pull request #149 from alex-gh/vg_cherry-picks
...
VG update_icon optimizations for APCs and canisters.
2014-02-08 20:47:03 -05:00
663ce30f0c
Merge pull request #152 from Regen1/master
...
Heavy laser buff, new sniper projectile
2014-02-08 20:46:52 -05:00
1300cf7b8f
Merge pull request #153 from SamCroswell/master
...
Admin Room Revamp, ERT Announcer Adjustments
2014-02-08 20:46:39 -05:00
4101ce7b5d
Admin room revamp
2014-02-08 13:35:35 -05:00
2abd278744
Heavy laser buff and new sniper projectile
...
Boosted the heavy laser to do 45 damage instead of 40, making it
slightly better than the standar laser.
Made the energy drain slightly less on mechs
Added a more slim projectile to the sniper rifle, the old fruit shot was
to fat
2014-02-08 13:20:59 +01:00
d4329e4815
Enemy Communication Intercepted...
...
security level elevated.
2014-02-08 02:22:47 -05:00
5ce97a7d25
More DNA fixes.
2014-02-07 20:56:21 -05:00
be3c95a9ff
Changes 'n shit
2014-02-07 18:43:48 -05:00
4b0f3e8b78
"Else" clause removal (/obj/machinery/portable_atmospherics/canister/update_icon()).
2014-02-07 06:51:11 +01:00
c86063c271
Fix genetics spells not working. GG for not using panel variable, nerds.
2014-02-06 23:52:20 -05:00
bd26d1b0b7
Various Pulse Rifle Fixes
2014-02-06 23:10:02 -05:00
96c45dd6a4
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-02-06 03:23:43 -05:00
05feddb2db
Merge pull request #146 from SamCroswell/master
...
Ported 'Add Reagents' Verb for VV from /TG/
2014-02-06 03:23:17 -05:00
7442282b08
Ninja and DS Mass Driver fixes
2014-02-05 23:02:44 -05:00
00f830cc2a
Remove radio debugging.
2014-02-05 22:51:03 -05:00
30e305f7e9
Fix AIs getting die glorious death.
...
Conflicts:
code/game/gamemodes/traitor/traitor.dm
2014-02-04 03:12:10 -05:00
3cedb27fe6
Bugfixes
2014-02-03 18:33:05 -05:00
2fd1e3b77b
Cryopod icon_state fix.
...
Missing _ in the icon states.
2014-02-03 02:20:12 -05:00
d7194e7ca0
Merge pull request #143 from SamCroswell/master
...
Ninja HUD/Messneger Update
2014-02-01 16:48:45 -08:00
3b515d1899
Ninja HUD Implemented, Thanks Wisewill!
2014-02-01 19:36:00 -05:00
c69ddf76ec
Reintroducing the dough-based cooking system.
...
Conflicts:
code/modules/food/recipes_microwave.dm
code/modules/reagents/reagent_containers/food/snacks.dm
icons/obj/food.dmi
2014-02-01 19:22:22 -05:00
05149946d6
Remove borken RPD
2014-02-01 04:30:17 -05:00
522e153bff
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-01-31 22:28:29 -05:00
433d7b52dd
Fix gene activation logic.
2014-01-31 22:27:46 -05:00
5e6b366ce4
Merge pull request #142 from alex-gh/dynamic_event_tweak
...
Dynamic event tweaks
2014-01-31 19:26:28 -08:00
SamCroswell