Commit Graph

9304 Commits

Author SHA1 Message Date
ZomgPonies
5f67943f8e Revert "APC bugfix after someone messed with mah areas!"
This reverts commit ceca0ddbe8.
2014-05-27 21:22:53 -04:00
ZomgPonies
2383017de1 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-27 20:09:39 -04:00
ZomgPonies
06bbfcf150 Final Nations patch before live testing. This is going to be painful. 2014-05-27 20:09:10 -04:00
Jeremy Liberman
7a51eb9f6c Secret Mutiny Mode backstory easter egg 2014-05-28 00:45:59 +02:00
d3athrow
386618f66b exploit fixes
Conflicts:
	code/game/machinery/Sleeper.dm
	code/game/machinery/cryo.dm
	code/game/mecha/mech_fabricator.dm
2014-05-27 14:30:03 -04:00
d3athrow
c50eb1217b Tested and Fixed #826
Conflicts:
	code/game/objects/items/stacks/stack.dm
2014-05-27 14:21:57 -04:00
ZekeSulastin
19c0352836 Uncomments application of languages to clone
Conflicts:
	code/game/machinery/cloning.dm
2014-05-27 14:04:13 -04:00
ZekeSulastin
b13b4d2392 Adds languages to DNA2 cloning records 2014-05-27 14:03:03 -04:00
Ccomp5950
07bf0822e8 Beepsky will no longer attack monkeys while doing weapons authorization checks.
I'd say it's a holdover from monkey epidemic but the truth is this is cael code that is being changed, it's been that way for over a year and I still can't rap my head around why these lines were put in.
2014-05-27 14:02:07 -04:00
ZomgPonies
9741799733 More work on nations, got most of the flag procs ready. Really missing the vassalage system. 2014-05-27 10:35:09 -04:00
ZomgPonies
9bf41d3405 4th Nations commit, Finished framework. Rest of gameplay code is within the flag object's attackby and dropped procs. 2014-05-27 01:20:20 -04:00
Ccomp5950
ceca0ddbe8 APC bugfix after someone messed with mah areas!
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas.  Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.

We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes.  The only downside to this 5 minutes is you might get free energy until that area becomes active.

Conflicts:
	code/controllers/master_controller.dm
	code/modules/power/apc.dm
2014-05-27 00:28:31 -04:00
ZomgPonies
9d45361f9b 3rd nations commit, moved nations to datums to make things easier down the line. 2014-05-27 00:20:39 -04:00
ZomgPonies
53090e314d Second commit for nations, respawning is in, splitting in teams is in. Time to get to work on the actual capture mechanics. 2014-05-26 21:33:46 -04:00
ZomgPonies
3c9dbcc822 First commit for nations gamemode, setting up the framework I'll be using. 2014-05-26 20:02:20 -04:00
ZomgPonies
581376e191 Nuke ops fixes 2014-05-26 17:57:39 -04:00
ZomgPonies
f36e5d206c Fix secborg tasers 2014-05-26 16:29:03 -04:00
Zuhayr
f97f7cedcc Lots of work on hardsuits, commented out some broken WIP code, did some renaming, deleted now-redundant species-specific hardsuits.
Conflicts:
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items.dm
	code/game/objects/items/devices/modkit.dm
	code/modules/clothing/masks/breath.dm
	code/modules/clothing/spacesuits/alien.dm
	code/modules/clothing/spacesuits/rig.dm
2014-05-26 13:58:17 -04:00
Zuhayr
3af5ac76d8 Squashed hardsuit and suit cycler commits:
Basic preliminary breach handling.
Breached spacesuits act more sanely and now result in pressure loss.
Preliminary work for upgrading hardsuits.
Adds suit cycler.
Working on breach data for hardsuits.
More tweaks to the suit cycler.
More rig changes/tweaks.

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2014-05-26 12:48:58 -04:00
Walter0o
28bac96530 exploit fix, electric boogaloo : canister edition
024a0baa49 removed the exploit protection of canisters without replacement, this commit fixes that.

without this, anybody can open/close valves and all other forms of messing with any canister from anywhere.

ALWAYS keep in mind, NanoUI will update the fancy buttons CLIENTSIDE, that does NOT protect against exploits !

the actual buttonpush can still be spoofed to the server even if NanoUI disabled/hid/greyed-out/removed the button !
Conflicts:
	code/game/machinery/atmoalter/canister.dm
2014-05-26 06:57:04 -04:00
ZomgPonies
413dcf9cdd Add karma jobs to the new ID computer framework 2014-05-26 06:40:50 -04:00
mwerezak
516bed9ddd Fixes bodybags not being able to be put back...
...into their own box. Also affects folded cryobags.
2014-05-26 06:21:43 -04:00
mwerezak
40baf28c7d Setting RD board access now uses visible_message 2014-05-26 06:21:15 -04:00
mwerezak
418ba281d7 Fixes circuit var for other consoles
Also cleans up attackby while we're at it.

Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/computer/arcade.dm
	code/game/supplyshuttle.dm
	code/modules/mining/mine_items.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/research/research_shuttle.dm
	code/modules/research/server.dm
2014-05-26 06:21:03 -04:00
mwerezak
dd2fcf0eb3 Fixes RD console circuit var not set.
Also removes redundant attackby code, and small change to text when
setting access protocol on the board.

Related to issue #5006
2014-05-26 06:13:37 -04:00
Loganbacca
6ea88aecfd Bot attack fix
- Fixes bots attacking through windows

Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/secbot.dm
2014-05-26 06:11:25 -04:00
ZomgPonies
f6a9016f34 Unathi flag in, waiting on spears and burning in-hands for the remaining flags. 2014-05-25 22:14:54 -04:00
ZomgPonies
aa4f29c5e8 Only one flag to go! 2014-05-25 21:34:25 -04:00
ZomgPonies
1c02329ef4 Machine people/synthetics flag 2014-05-25 18:54:37 -04:00
Walter0o
b14099db47 fixes 2 gameticker.dm bugs
fixes two bugs in gameticker.dm :
1.) the default value for hide_mode MUST be 0, otherwise all modes even outside Secret rounds will show up as a Secret round with no possible modes. the proper way of hiding the actual mode in Secret is letting /datum/controller/gameticker/proc/setup() deal with it.
if you want to reproduce this, switch your server to any other mode before roundstart, it will still say Secret with no possible modes.

2.) if there are no /obj/effect/landmark/spacepod/random placed on the map, pick(L) triggered a runtime error because the list was emtpy. a simple len check takes care of that.
also whats with the supercautious type-checks in for loops ? nothing will change the contents of the temporary L list.
2014-05-26 00:29:27 +02:00
ZomgPonies
812e25f992 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-25 16:58:13 -04:00
ZomgPonies
f184c8fd5c On-fire in-hand for all current flags 2014-05-25 16:57:59 -04:00
Jeremy Liberman
b3d3f5df8c Mutiny fix prereqs for directives
Conflicts:
	code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
	code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
	code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
	code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
	code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
	code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
	code/game/gamemodes/mutiny/directives/terminations_directive.dm
	code/game/gamemodes/mutiny/directives/test_directive.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
2014-05-25 22:34:39 +02:00
ZomgPonies
f3d04ab657 You can now set flags on fire -- in-hands on fire missing 2014-05-25 15:39:12 -04:00
d3athrow
8e5259aaae Muck with firedoor layers so they dont appear over airlocks when closed making it almost impossible to close airlocks easily.
Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
2014-05-25 13:45:09 -04:00
ZomgPonies
aab6cb2430 Adds Vox and Pony flags 2014-05-25 11:50:08 -04:00
ZomgPonies
dae3e2d5e8 Adds Skrell and Ninja flags 2014-05-25 05:36:12 -04:00
ZomgPonies
7bbac52dc8 Moar flags 2014-05-25 03:03:16 -04:00
ZomgPonies
11a1deb1ac Trying to cut down on attack lock spam 2014-05-24 17:17:38 -04:00
ZomgPonies
eed61ed46c Remove debug line 2014-05-24 16:51:50 -04:00
mwerezak
62daf11857 Possible fix for mutiny modes not being selected
Not entirely sure, I've had trouble with the in operator precedence with
for-loops in the past. I can't test without seven people though.
2014-05-24 22:08:46 +02:00
mwerezak
448d3697b6 Fixes bluespace contagion directive selecting...
ghosts and new players as infected.
2014-05-24 22:08:27 +02:00
ZomgPonies
497a113bf3 Atmosia flag! All departments are covered...now to code nations gamemode. 2014-05-24 14:32:51 -04:00
ZomgPonies
55de2b38a7 Wizard flag 2014-05-24 13:09:10 -04:00
ZomgPonies
08b69878f7 Only atmosia flag left to do! 2014-05-24 12:27:55 -04:00
AlexanderSeto
9e30143349 Merge remote-tracking branch 'upstream/master' 2014-05-24 09:01:41 -07:00
AlexanderSeto
586e9633f1 Adds the rapid part exchange device 2014-05-24 08:56:51 -07:00
ZomgPonies
463537e9a2 Bunch of new flags. 2014-05-24 11:38:32 -04:00
ZomgPonies
029ce0b1ca Syndi flag + more flag organizing. 2014-05-24 10:56:48 -04:00
ZomgPonies
162b936bd3 Fixed up in-hands and flags and shit jesus fucking BYOND christ 2014-05-24 10:40:38 -04:00