cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 20:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

1388 Commits

Author SHA1 Message Date
Mark van Alphen
0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-13 22:14:38 +02:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
Mark van Alphen
2618def9a1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/Delta/delta.dmm
#	_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
#	_maps/map_files/MetaStation/z4.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
#	_maps/map_files/RandomZLevels/spacebattle.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
#	_maps/map_files/cyberiad/z4.dmm
#	_maps/map_files/cyberiad/z6.dmm
#	_maps/map_files/generic/z5.dmm
#	code/__DEFINES/misc.dm
#	code/__HELPERS/unsorted.dm
#	code/game/objects/structures/lattice.dm
#	code/game/turfs/space/space.dm
#	code/modules/mob/mob.dm
#	code/modules/ruins/ruin_areas.dm
#	paradise.dme
 2019-05-08 21:40:35 +02:00
AffectedArc07
96edeacec5 Removes unused hooks 2019-05-05 10:28:56 +01:00
Mark van Alphen
ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
 2019-04-30 19:26:17 +02:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
variableundefined
c8d890ef8a Merge pull request #11365 from Kyep/id_card_tracking 
Upgrades ID Computer
 2019-04-30 13:28:03 +08:00
variableundefined
3ae90a2608 Merge pull request #11369 from Arkatos1/Boards 
Circuit Boards now show their required components on examine
 2019-04-30 13:24:58 +08:00
variableundefined
32376093cb Merge pull request #11393 from Fox-McCloud/powernet-refactor 
TG Powernet Refactor
 2019-04-30 12:42:53 +08:00
Kyep
07b269264a restricts deletion of only your logs to centcom, deletion of all requires ID computer access 2019-04-29 20:47:45 -07:00
Kyep
97e53916f6 job transfers now correctly update job slots 2019-04-29 20:10:06 -07:00
variableundefined
1320f6ce0b Merge pull request #11338 from Arkatos1/IDsound 
Adds sound when adding or removing IDs from ID modification computers
 2019-04-29 23:02:07 +08:00
Fox McCloud
d0a077f9d5 Powernet Refactor 2019-04-27 02:06:04 -04:00
Kyep
6d0d7ae506 fix centcom computers, add crew transfer log feature 2019-04-24 15:43:08 -07:00
Arkatos1
b4ecfa4cec Boards now show their required components on examine 2019-04-24 17:21:04 +02:00
Kyep
3ef424eb5c upgrades ID computer 2019-04-23 21:02:27 -07:00
Mark van Alphen
ccef4d1187 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-04-24 02:55:32 +02:00
AffectedArc07
fa6ba7343f Merge branch 'master' into ss-alarms 2019-04-23 20:37:42 +01:00
AffectedArc07
acee1dcb42 SSalarms 2019-04-23 12:45:35 +01:00
variableundefined
03a5ee47b8 Merge pull request #11292 from farie82/puke-refactor 
Refactors puke to make it less lag inducing
 2019-04-23 19:45:01 +08:00
Fox McCloud
4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything 
Gives the orphans a home
 2019-04-21 18:44:38 -04:00
Mark van Alphen
7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-04-21 23:27:23 +02:00
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Arkatos1
33907487b8 Adds sound when adding and removing ID cards from ID identification computers 2019-04-20 17:30:46 +02:00
AffectedArc07
52dff88bd9 Die monster! You don't belong in this world! 2019-04-17 16:30:43 +01:00
joep van der velden
55282f15d6 less puke related lag 2019-04-12 22:58:11 +02:00
Mark van Alphen
f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
 2019-04-10 21:54:54 +02:00
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update 
The Nations Update Everyone Deserves!
 2019-04-09 20:47:34 -07:00
variableundefined
c33aecafb8 Merge pull request #11246 from TDSSS/upload 
Small law upload console tweak
 2019-04-07 21:20:03 +08:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
TDSSS
a1c52dcb22 More helpful error message when uploading laws 2019-04-06 00:07:13 +02:00
Mark van Alphen
a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Crazy Lemon
8faef099bb Merge pull request #11146 from farie82/cloning-dupe-fix 
Auto processing doesn't clone people twice (or more)
 2019-04-03 11:32:22 -07:00
joep van der velden
530ff1353f no more ckey check required 2019-04-03 09:31:25 +02:00
joep van der velden
c845e9860f uses clonemind instead 2019-04-02 17:54:39 +02:00
Fox McCloud
0b06a32cc9 Merge pull request #11165 from Markolie/issues 
Resolve some issues that the compiler doesn't spot
 2019-04-01 18:22:43 -04:00
Mark van Alphen
1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00
Mark van Alphen
1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Mark van Alphen
a05b37c5ca General Lavaland fixes, add Hierophant ruin 2019-03-31 01:12:10 +01:00
Mark van Alphen
45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen
2047825165 Finish up Lavaland map 2019-03-30 21:08:33 +01:00
joep van der velden
451253dc5b one if 2019-03-30 17:31:54 +01:00
joep van der velden
a5401b40f1 github suggestions 2019-03-30 17:30:19 +01:00
Mark van Alphen
b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
joep van der velden
5020c3a162 Check in scan instead 2019-03-29 09:15:48 +01:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
joep van der velden
82096b5338 also supports the directly put in body thing 2019-03-27 12:23:12 +01:00
joep van der velden
d52f4c1881 Cloners now only clone a person once max 2019-03-27 12:11:29 +01:00
AffectedArc07
cf39d5e96e Left my comments in whoops 2019-03-09 10:31:37 +00:00
AffectedArc07
13c26d716c Uses a list instead of world search 2019-03-09 10:31:36 +00:00