cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,414 Commits 26 Branches 2 Tags
940f87b210c311fdb5bbb5c00a17b68aad95eeea
Commit Graph

549 Commits

Author SHA1 Message Date
tayyyyyyy
57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
variableundefined
d84d2a0b55 Merge pull request #11562 from Tayyyyyyy/markdown 
Support markdown in papers
 2019-07-08 20:20:46 +08:00
Mark van Alphen
ef479cb982 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/feet.dmi
#	paradise.dme
 2019-05-23 19:04:09 +02:00
tayyyyyyy
066343ad31 Support markdown 2019-05-21 13:49:51 -07:00
Fox McCloud
d61c34e537 Merge pull request #11546 from Shadeykins/Paper-Exploit 
Fixes paper.dm issue
 2019-05-18 16:26:57 -04:00
Shadeykins
7249cd84b5 Word choice. 2019-05-18 13:24:35 -06:00
Shadeykins
69e50ae70b Fixes potential paper exploit. 2019-05-18 13:21:38 -06: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
Mark van Alphen
d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-04 03:16:38 +02:00
Mark van Alphen
f3fb39b339 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/__DEFINES/misc.dm
 2019-05-04 03:07:36 +02:00
variableundefined
5357e0e36f Merge pull request #11428 from Markolie/bundles 
Chameleon overhaul
 2019-05-04 08:23:40 +08:00
Mark van Alphen
35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/toy.dmi
 2019-05-03 18:31:45 +02:00
Mark van Alphen
d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
 2019-05-03 18:30:07 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Dovixx
e0015b69ba Proper fix (And yes i did forget about this PR) 2019-04-30 22:45:00 +03:00
Dovixx
9024108454 Merge branch 'master' into Camera-spook 2019-04-30 22:00:37 +03: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
variableundefined
86d6ee8256 Merge pull request #11356 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/patch-2 
[s]fixes a couple exploits
 2019-04-30 11:39:34 +08: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
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
AffectedArc07
563a951975 SSevents & SSholiday 2019-04-23 10:55:36 +01:00
1fbff5f83b23d39d38b1dfcb4cac8d9b
a8f5393678 Update clipboard.dm 2019-04-22 22:04:48 +02:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +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
Fox McCloud
afa4e751db Merge pull request #11195 from Twinmold93/tonerless_sending 
Fixes Sending Faxes Using Toner
 2019-04-06 03:15:53 -04:00
Twinmold
d5a4db247c KasparoVy Change (It didn't take the first time... ?) 
For whatever reason, first time it didn't actually take.
 2019-04-03 00:46:43 -05:00
Twinmold
08e2512e6f KasparoVy Change 
Just took his line. Works.
 2019-04-03 00:45:39 -05:00
Twinmold
9bb2cab1a0 Less Parenthesis 
Simple, right?
 2019-04-03 00:35:22 -05: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
Twinmold
37a8d796a6 One Less Line 
All this does is turns the sanity check into a not check rather than an
empty positive check.
 2019-03-31 17:39:40 -05:00
Twinmold
f65bfef89e Fixes Sending Faxes Using Toner 
As the code currently stands, whenever you send a fax to Central Command
or the Syndicate, it makes a non-existant copy of the fax using toner
from your own machine. This fix removes unnecessary code and no longer
requires toner to send a fax.

Fixes: #11172

🆑 Twinmold
Fix: No longer costs toner to send a fax to Central Command
/🆑
 2019-03-31 16:45:43 -05:00
Mark van Alphen
1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02: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
b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
Fox McCloud
814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
Dovixx
ad0cfc2e67 Fix the logic 2019-03-26 19:57:23 +02:00
variableundefined
4ca33bb19d Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature 
[Goonchem] Reagent Temperature and Pyrotechnics
 2019-03-24 17:50:07 +08:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
joep van der velden
e83a7131cc Refactored pickup code and fixed the bug 2019-03-18 16:42:44 +01:00
variableundefined
9d821534a5 Merge pull request #10845 from Quantum-M/bureaucraticUpdate 
Updates stamps and adds contract sprites.
 2019-03-14 15:04:40 +08:00
Citinited
4c1c8ce21b he -> he or she and splits up the huge line into six lines 2019-02-11 23:38:15 +00:00
Citinited
8d88900a04 spellchecks Nanotrasen contract 2019-02-11 23:26:55 +00:00
B.A.L
9888cf8c74 Updates stamps and contract sprites. 2019-02-07 21:01:55 -07:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
Dovixx
6741238ef1 Stop the animals! 2019-01-23 22:34:51 +02:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
variableundefined
b8cf02722b Merge pull request #10651 from alex-gh/devil_expansion 
Devil friends
 2019-01-15 07:47:57 +08:00