cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 00:52:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,648 Commits 26 Branches 2 Tags
172055dcfc8ceedb8fb53aace7d76db008682937
Commit Graph

12708 Commits

Author SHA1 Message Date
ZomgPonies
172055dcfc Hurr Durr 2014-05-26 06:02:20 -04:00
ZomgPonies
a538b8b723 We don't care if you're punching yourself. 2014-05-26 05:55:35 -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
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
ZomgPonies
517c048342 Merge pull request #226 from Walter0o/gameticker_fixes 
fixes 2 gameticker.dm bugs
 2014-05-25 18:47:32 -04:00
ZomgPonies
7ccdcbce93 Preleminary work on robolimbs. Expect more soon. 2014-05-25 18:45:49 -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
Walter0o
198b4863b6 fixed crafting_master hook 
when world.dm got changed from calling the setup procs itself to using hooks,
crafting was overlooked.

why are all commits not tested beforehand in a dev branch ?
 2014-05-25 18:23:48 +02: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
dd298e4dda Fix invisible containers for inflatable shit 2014-05-25 05:34:48 -04:00
ZomgPonies
d7ba08a28c Rawwr 2014-05-25 04:43:21 -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
mwerezak
4299c2b174 Attempts to fix shuttle not being recallable 2014-05-24 22:08:02 +02:00
ZomgPonies
497a113bf3 Atmosia flag! All departments are covered...now to code nations gamemode. 2014-05-24 14:32:51 -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
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
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
ZomgPonies
e1ce0ee664 Errr 2014-05-24 09:15:26 -04:00
ZomgPonies
b4f5df6d1d Made flags unable to fit in backpacks. 2014-05-24 09:11:27 -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
ZomgPonies
769214e535 Refactored flags, added in excellent Clown Planet flag by Wubbledaddy 2014-05-24 07:48:29 -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
Mloc-Argent
1b2f83dee4 BS12 Hooks 2014-05-22 23:56:35 +02:00