cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-17 10:02:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 12 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

1969 Commits

Author SHA1 Message Date
ZomgPonies
5351b1241b Finalize Nations Status command 2014-06-01 14:19:25 -04:00
d3athrow
1db910ced1 telling lings they can regen 2014-06-01 13:21:00 -04:00
ZomgPonies
30ff023926 Everyone gets to see their own little nation icon. 2014-05-31 19:52:29 -04:00
ZomgPonies
5149029042 Remove debug message from liege/vassal stuff 2014-05-31 16:24:40 -04:00
ZomgPonies
5bed3f68d8 Removed verb until I can rewrite it. 2014-05-31 11:11:33 -04:00
ZomgPonies
f0e87d4775 Merge pull request #238 from Loganbacca/nations 
Flag capture alert fix
 2014-05-31 10:54:41 -04:00
Zuhayr
31faa31f36 Fixes end of round drone spam. 2014-05-31 10:46:37 -04:00
Loganbacca
88f96e45b0 Fixes nation change messages 2014-05-31 21:06:24 +12:00
ZomgPonies
b080315f48 Debug stuff removed 2014-05-30 15:29:33 -04:00
alex-gh
1dba2dd59d Merge pull request #235 from alex-gh/uplink_greentext 
TC use count appears on round end
 2014-05-30 20:30:05 +02:00
ChuckTheSheep
7491cd7b65 TC use count appears on round end 
Conflicts:
	code/datums/uplink_item.dm
	code/game/objects/items/devices/uplinks.dm

Adds Icons and purchase list

Conflicts:
	code/datums/uplink_item.dm
	code/game/gamemodes/traitor/traitor.dm
	code/stylesheet.dm

CSS is hard

Conflicts:
	code/game/gamemodes/traitor/traitor.dm

Mah Indents

Made Purchase Log Text rather than List

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Moved images to top "survived" line

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Boxes show contents

Nuke Ops Group Shaming

Conflicts:
	code/game/gamemodes/nuclear/nuclear.dm

Uses compiled list for uplinks

Conflicts:
	code/game/objects/items/devices/uplinks.dm
 2014-05-30 20:28:35 +02:00
d3athrow
9fe7024fd5 Lingading fixes 
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	html/changelog.html
 2014-05-30 11:17:43 -04:00
ZomgPonies
67063dbd7f Bleh 2014-05-30 11:13:46 -04:00
ZomgPonies
cf061cb953 Bunch of fixes left and right, fixes script to get giant map jpg 2014-05-29 21:40:16 -04:00
d3athrow
c7992c15b8 Buff vampire blood sucking damage 2014-05-29 18:16:49 -04:00
d3athrow
bd980f155c Some vampire fixes 
Conflicts:
	code/game/gamemodes/vampire/vampire_powers.dm
 2014-05-29 18:16:03 -04:00
ZomgPonies
451e05d6bc Final nations fixes hopefully 2014-05-29 12:54:12 -04:00
ZomgPonies
d9852332e2 Moar fixes 2014-05-29 12:27:14 -04:00
ZomgPonies
0d28defb2d Oops 2014-05-29 10:24:49 -04:00
ZomgPonies
113f98a9e1 Post test #4 fixes 2014-05-29 09:52:58 -04:00
ZomgPonies
4cfc433cea Post test #4 bugfixes 2014-05-28 19:27:48 -04:00
ZomgPonies
ea084c06eb Post test #3 nations bugfixes 2014-05-28 18:20:22 -04:00
ZomgPonies
225fd465c1 Post Test #2 bugfixes 2014-05-28 14:36:55 -04:00
ZomgPonies
0f765fe912 Nations fixes 2014-05-28 08:44:49 -04:00
ZomgPonies
f9281d82c3 Post test #1 bugfixes 2014-05-27 23:35:59 -04:00
ZomgPonies
1e988ac2fb Try to fix nations start 2014-05-27 21:50:03 -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
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
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
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
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
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
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
Mloc-Argent
1b2f83dee4 BS12 Hooks 2014-05-22 23:56:35 +02:00
alex-gh
3281c5f150 Merge pull request #213 from alex-gh/mutiny_fixes2 
Mutiny fixes? 3
 2014-05-21 16:33:06 +02:00
alex-gh
d14d253414 Mutiny fixes? 3 
Attempt to fix mutiny by replacing .Add() and .Remove() with += and -=
 2014-05-21 16:30:49 +02:00
ZomgPonies
f0ebf536c9 Renamed Atmos Tech to life support specialist due to new grav gen responsabilities 2014-05-20 16:12:36 -04:00
ZomgPonies
9e89c8cdcb Mutiny fixes 
Conflicts:
	code/game/gamemodes/mutiny/mutiny.dm
	code/game/objects/items.dm
 2014-05-20 13:06:59 +02:00
alex-gh
5066000778 Replayed mutiny fixes 2014-05-20 13:01:15 +02:00
alex-gh
54db12f702 Merge pull request #206 from alex-gh/mutiny_fixes 
Merged latest mutiny fixes.
 2014-05-19 19:56:10 +02:00
alex-gh
4dc1e5c0b3 Merged latest mutiny fixes. 2014-05-19 19:54:42 +02:00
ZomgPonies
31e88a71f7 Made nukeops pinpointer fit in PDA slot 2014-05-19 05:31:01 -04:00