cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 05:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,711 Commits 26 Branches 2 Tags
047f0bdd67e42ac7d9db3abfe6aeddbe5e346c04
Commit Graph

7297 Commits

Author SHA1 Message Date
Zuhayr
047f0bdd67 Fixes #4643 
Conflicts:
	code/modules/mob/living/simple_animal/hostile/mimic.dm
 2014-05-28 08:51:44 -04:00
Chinsky
d37e54bf73 Added new BBCode tags, for tables and NT logo. Removes html support from paper. 
Conflicts:
	html/changelog.html
 2014-05-28 08:49:24 -04:00
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
alex-gh
21bd350299 Removed AI lawsync for drones 2014-05-27 23:31:14 +02:00
d3athrow
8db91a3273 Image pooling for human unconscious/oxygenloss/fire&bruteloss screen overlays. 2014-05-27 14:20:55 -04:00
d3athrow
f3d3bd620f Should fix #727 for humans and monkeys. 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2014-05-27 14:16:24 -04:00
mwerezak
3a2da98639 More sensible oxyloss scaling 2014-05-27 14:07:27 -04:00
mwerezak
ca176b63f5 Fixes inhale_pp ratio 
The amount of inhaled gas used shouldn't approach infinity as inhale_pp
goes to zero, should it?

Also the amount of gas used should decrease with inhale_pp as the
oxyloss is being caused by the fact that fewer moles are entering the
bloodstream.
 2014-05-27 14:07:18 -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
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
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
b327d3967d More suit fixes 2014-05-26 17:10:28 -04:00
ZomgPonies
d14b50ba65 Fix preferences menu maybe 2014-05-26 16:24:39 -04:00
ZomgPonies
f347fc55fd Revert "Fix rad alert lighting." 
This reverts commit e887dbe9b6.
 2014-05-26 15:53:30 -04:00
ZomgPonies
2ce3881ad5 Fix Fat and Skintones 2014-05-26 15:06:11 -04:00
ZomgPonies
b173b0ac3b Fix Unathi hardsuits maybe? 2014-05-26 14:47:52 -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
05809ec585 Changed by-species icon sheets to by-clothing species-specific icon sheets. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/species.dm
 2014-05-26 13:30:47 -04:00
Zuhayr
29f7200968 Prevented toggling a suit helmet while holding the suit. 2014-05-26 12:49:19 -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
ZomgPonies
b427215ca0 Carbon exploit fix 2014-05-26 06:23:39 -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
89af05fd25 Fixes wrong access on RD console 2014-05-26 06:13:47 -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
mwerezak
2618439195 Fixes #5050 2014-05-26 06:13:01 -04:00
mwerezak
cb5ffe6d2c Forgot to add VV menu entry for give_disease2 2014-05-26 06:12:21 -04:00
mwerezak
9934a32cd3 Fixes #4889 2014-05-26 06:12:10 -04:00
ZomgPonies
172055dcfc Hurr Durr 2014-05-26 06:02:20 -04:00
ZomgPonies
7c9e466452 Can't forget Ian 2014-05-26 05:52:08 -04:00
ZomgPonies
2ad46a6bcb All 25 flags have their on-fire in-hands, all species flags added to merch computer. 2014-05-26 05:44:16 -04:00
ZomgPonies
7ccdcbce93 Preleminary work on robolimbs. Expect more soon. 2014-05-25 18:45:49 -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
11a1deb1ac Trying to cut down on attack lock spam 2014-05-24 17:17:38 -04:00
ZomgPonies
b81acff7a3 Fix charge_costs of guns 2014-05-24 14:03:37 -04:00
ZomgPonies
0b2fd89f55 Hopefully fix vending machines 2014-05-24 13:49:21 -04:00
ZomgPonies
f5e69887a1 Fix Taj/Unathi/Whatever skin color. Let FurryRaveStation13 continue! 2014-05-24 08:24:09 -04:00
ZomgPonies
c25b72b83e Merge pull request #220 from Regen1/Hyperzine-fix 
Hyperzine fix
 2014-05-24 07:52:42 -04:00
Regen
4b94406efb Nerfs for OD 2014-05-23 23:10:04 +02:00
ZomgPonies
d099ca5a19 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-23 14:32:01 -04:00
ZomgPonies
fac32af2f1 First commit of liquid simulation stuff 2014-05-23 14:31:29 -04:00
Regen
d6702496f9 Hyperzine fix 
Now lasts shorter and isn't deadly at 5 units
 2014-05-23 17:33:34 +02:00
alex-gh
be8d9eb026 Fixed spaceacillin metabolism, its useful again 2014-05-23 10:53:26 +02:00
ZomgPonies
6faa9e3be9 Forgot this 2014-05-23 02:18:41 -04:00
ZomgPonies
a521f88e95 Final dodgeball fixes 2014-05-23 01:15:24 -04:00
ZomgPonies
cbd1148d12 Every round ender needs a good theme song. TODO: Switch all these to play from a global jukebox in streaming. 2014-05-23 00:06:46 -04:00
ZomgPonies
e191f93767 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-22 23:50:23 -04:00
ZomgPonies
20184bb9cd Ccomp fixes to mesons 2014-05-22 23:49:57 -04:00