cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 15:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,297 Commits 26 Branches 2 Tags
69f7e047192c7b048f5f9c91c93bd772d50737d3
Commit Graph

144 Commits

Author SHA1 Message Date
Markolie
ef3e2e8c7b Fix tabbing 2015-07-26 22:15:12 +02:00
Markolie
573843c237 Revenant pref update 2015-07-26 22:13:24 +02:00
Fox-McCloud
1804586fbd Adjusts Character Setup and Job Selection Menus 2015-07-05 08:48:30 -04:00
Robertha89
fdb302e5a6 7 days 2015-07-01 03:40:47 +02:00
Robertha89
b069ed6b01 Revert "7 days" 
This reverts commit 42c5c29b12.
 2015-07-01 03:38:41 +02:00
Robertha89
42c5c29b12 7 days 
title
 2015-07-01 03:37:11 +02:00
Robertha89
db7d636c29 Fixes derp 
There is to Revenant gamemode.
 2015-06-30 21:35:10 +02:00
Robertha89
c9a8695f0c Revenant Role Candidacy 
Fixes https://github.com/ParadiseSS13/Paradise/issues/1395 maybe
 2015-06-30 21:31:02 +02:00
Fox-McCloud
c262be4d30 dun dun dun 2015-05-25 03:42:24 -04:00
Fox-McCloud
791ebc0b7f New Race: Canine Race--Vulpkanin 2015-05-24 01:00:19 -04:00
ZomgPonies
95b1c1d87c Adds two new event species 2015-05-14 22:30:38 -04:00
DZD
dd27b54f15 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling 2015-04-22 11:51:18 -04:00
ZomgPonies
1cc53ab186 Yeah and this too. 2015-04-21 20:00:19 -04:00
DZD
8de0140dcc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/setup.dm
 2015-04-21 18:56:34 -04:00
ZomgPonies
dddecb9025 Change slime people to not need mutantrace anymore. 2015-04-13 07:59:25 -04:00
DZD
00035a51f0 It compiles! 
- Makes shadowlings compile, require snowflaking of a few things to the
human Life() proc due to how Bay species works.
- Renames monkeyizing var to notransform, as that's effectively what it
was used for, to prevent transformation. (/tg/ port)
 2015-04-12 19:54:45 -04:00
DZD
0ab3a54fcb Copy-Paste Port of /tg/station's Shadowlings 
Ports tgstation/-tg-station#8157

This won't compile, needs to be bugfixed and tested. The only reason I
am PRing  this right now is so that we don't have multiple people
working on the same thing.

@ZomgPonies This will require PROBABILITY SHADOWLING # to be added to
game_options.txt, and will likely require SQL database additions for the
BE_SHADOWLING antag preference.
 2015-04-12 13:15:40 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
ZomgPonies
c693be1c57 Merge pull request #548 from tigercat2000/SlimeColorChanger 
Allows slime people to change color in lobby.
 2015-03-11 16:53:29 -04:00
ZomgPonies
d1587addaf No more crazy random colors 2015-03-09 22:32:14 -04:00
Tigercat2000
64c0db3a80 Merge branch 'master' of github.com:ParadiseSS13/Paradise into SlimeColorChanger 2015-03-04 17:20:26 +01:00
Markolie
d7a2559065 Bug fixes galore 2015-03-01 20:35:07 +01:00
Markolie
5e4539157c Add minimum age for drones/ERT 2015-02-28 19:40:56 +01:00
Markolie
20ac07de8d Bug fixes 2015-02-27 17:51:57 +01:00
Markolie
3f51486ba4 Bug fixes, bot proces controller update 2015-02-24 01:40:43 +01:00
Markolie
982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Markolie
f590c215b7 Comma fix 2015-02-17 01:04:38 +01:00
Markolie
d7f17f6eba Bug fixes, give roboticist toolbelt, AI recall shuttle option 2015-02-17 01:04:04 +01:00
Markolie
3f80f66411 Simplify get_candidates, minor adjustment to antag ages 2015-02-12 19:09:05 +01:00
Tigercat2000
5c87c9f92c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-07 02:00:45 +01:00
Markolie
86dd7782d5 Add cyborg latejoining 2015-02-05 14:27:39 +01:00
Markolie
afac549c39 Revert economy changes, quarantine law fix 2015-02-02 20:02:29 +01:00
Fox-McCloud
0d7c972084 Merge pull request #238 from Markolie/master 
Mapfix, dbconfig update, sec camera template network fix, code cleanup, additional jobbans, antag minimum age
 2015-01-31 19:54:51 -05:00
ZomgPonies
8049264b1c Default_slot fixes. 2015-01-31 19:07:20 -05:00
ZomgPonies
b5e66de4c3 Econ Phase 1 Bugfix: Fixes people with random names spawning with no ID 2015-01-31 17:15:51 -05:00
Markolie
c520856716 Additional jobban options, minimum account age for antags 2015-01-31 19:48:48 +01:00
Tigercat2000
af6cd76365 New Preference; Slime People Color. This allows slime people 
to choose their color in the lobby. MySQL sync to come later.
 2015-01-30 01:14:57 +01:00
Markolie
ced499edc3 Vox Heist port from Bay 2015-01-10 06:21:21 +01:00
Markolie
c1b48b40b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/modules/client/preferences.dm
 2015-01-06 23:40:34 +01:00
Markolie
3f8c04686d Vox trader changes 2015-01-06 23:36:26 +01:00
Fox-McCloud
d70cda53e2 Merge pull request #87 from PJB3005/voxmasterrace 
Old vox choice
 2015-01-05 22:57:03 -05:00
Markolie
da8115dc2e Bug fixes 2014-12-20 16:27:33 +01:00
PJB3005
67c1b34aae oops, I forgot a thing 2014-12-18 13:04:54 +01:00
PJB3005
a272cb2626 Old vox choice 2014-12-17 14:18:57 +01:00
Markolie
37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
Fox-McCloud
21a1c0bc83 Stunning Changes 2014-12-06 02:33:31 -05:00
JimTheCactus
7304682f62 Changes check to an isnull rather than a truth test 
This allows the client to detect the difference between a blank and someone pressing cancel.
 2014-07-27 14:44:05 -04:00
JimTheCactus
b23f424ed1 Added check for blank on name entry 
Since cancel just returns a blank this checks for that and doesn't raise an error.
 2014-07-27 14:43:53 -04:00
Zuhayr
ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit. 
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
 2014-07-25 11:10:01 -04:00
ZomgPonies
399e4909d6 The death of assistants. Long live civilians! 2014-06-27 17:57:18 -04:00