cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-09 23:43:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 16 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

9380 Commits

Author SHA1 Message Date
Arkatos1 7363c31ea9 Initial commit 2019-04-30 23:59:28 +02:00
AffectedArc07 acf43fac3a V2 2019-04-30 19:19:18 +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
Mark van Alphen ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
AffectedArc07 ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
KasparoVy 66baa9e41b Adds Eyewear Adjustment: Wearing Over/Under Masks 
Adds a verb that'll let you adjust eyewear to be worn above or below a mask. Purely cosmetic.
 2019-04-30 01:00:24 -04:00
Twinmold93 726e0af91a rebase 2019-04-29 23:43:32 -05:00
variableundefined 3aab59f686 Merge pull request #11414 from Markolie/pai 
pAI admin message fix
 2019-04-30 11:33:18 +08:00
variableundefined a1d349dd36 Merge pull request #11405 from Markolie/drone 
Remove an admin message when drones join
 2019-04-30 11:31:17 +08:00
variableundefined 5b98e861f0 Merge pull request #11299 from Kyep/ssd_auto_cryo_option 
Better SSD management
 2019-04-30 11:29:49 +08:00
variableundefined 739ae3fd03 Merge pull request #11396 from Arkatos1/Deadtelefix 
Small Ghost teleport verb refactor
 2019-04-30 11:03:44 +08:00
variableundefined cb3ba0f5d0 Merge pull request #11334 from Arkatos1/BorgDeathSound 
Adds deathsound for Silicons
 2019-04-30 09:57:16 +08:00
Mark van Alphen e54103d1eb pAI fix 2.0 2019-04-30 01:34:25 +02:00
Mark van Alphen 4c71d1addf pAI admin message fix 2019-04-30 01:10:10 +02:00
Arkatos1 e26b578e6c Code review fixes 2019-04-30 00:31:30 +02:00
Arkatos1 cd32b0211b Carp Expansion Pack 2019-04-29 23:47:25 +02:00
joep van der velden 6c4288f732 correct check now for uninstal 2019-04-29 22:00:17 +02:00
joep van der velden 4e4e9bfe79 Various borg fixes 2019-04-29 21:56:01 +02:00
Mark van Alphen cc7864e08a Remove admin message when drones join 2019-04-29 18:53:14 +02:00
variableundefined dca417f652 Merge pull request #11319 from Arkatos1/ToolBots 
Adds Floorbot color variants
 2019-04-29 23:43:24 +08:00
Arkatos1 7b8671cdab Code review fixes 2019-04-29 17:15:09 +02:00
Kyep 6351c3fba1 Makes active internals visible on inventory examine 2019-04-29 01:18:41 -07:00
Mark van Alphen 4705c4e2fe Limit genetics XRay again 2019-04-28 20:15:30 +02:00
Fox McCloud 4e4697ad2f Merge pull request #11391 from farie82/admin-pm-fix 
PM's work again
 2019-04-28 13:42:45 -04:00
Arkatos1 f5e93bdea2 Small dead tele refactor 2019-04-27 23:40:25 +02:00
joep van der velden 86c8cf0c8b PM's work again 2019-04-27 22:25:04 +02:00
Mark van Alphen 97fbfb279a Fix default statue vision 2019-04-27 01:15:21 +02:00
Mark van Alphen 40c1a25eb5 Lighting fixes 2019-04-27 01:08:17 +02:00
Mark van Alphen 4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
 2019-04-26 23:07:57 +02:00
Mark van Alphen e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-04-26 22:58:56 +02:00
Kyep 1dccef300f Adds message if someone tries to join with no available slots. 2019-04-26 02:33:20 -07:00
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04: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
Mark van Alphen 9e9d72d2ae Darkness fixes 2019-04-24 00:47:55 +02:00
Mark van Alphen 0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
AffectedArc07 fa6ba7343f Merge branch 'master' into ss-alarms 2019-04-23 20:37:42 +01:00
Fox McCloud ff1edb1080 Merge pull request #11300 from Arkatos1/Ghost_Hud 
Adds Observer HUD buttons + Refactor of some ghost verbs
 2019-04-23 15:11:15 -04:00
variableundefined 624699e6d9 Merge pull request #11332 from Arkatos1/VarArts 
Adds an option to grant Martial Arts via Var menu
 2019-04-23 20:47:03 +08:00
variableundefined ce87d5208f Merge pull request #11355 from Kyep/href_hack_alert_fix 
Fixes unnecessary pAI warning for admins
 2019-04-23 20:42:10 +08: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
variableundefined b738f9a92f Merge pull request #11283 from Fox-McCloud/emote-refactor 
Emote Refactor
 2019-04-23 19:44:26 +08:00
variableundefined b37e55998e Merge pull request #11278 from Arkatos1/Summon_Ghosts 
New Wizard spell - Summon Ghosts!
 2019-04-23 18:52:03 +08:00
Kyep d61d8a3dc1 new feature: ssd warning system 2019-04-22 21:38:47 -07:00
Kyep 7ff8357499 counter support 2019-04-22 21:29:11 -07:00
Mark van Alphen affae89028 Attempt update to /tg/ lighting system 2019-04-22 19:55:41 +02:00
Mark van Alphen c4dc5ecd3d Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-22 18:52:55 +02:00
Kyep e1fe8b3196 Fixes href warning 2019-04-22 07:35:58 -07: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