cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 23:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,837 Commits 26 Branches 2 Tags
affa319fabd30e7a661dcbee6bc321f2a971f78e
Commit Graph

579 Commits

Author SHA1 Message Date
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
86e6d85093 Nutrition Refactor (#12389) 2019-09-24 15:17:55 -07:00
Fox McCloud
c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
Fox McCloud
12345d178b ahhh that'd do it 2019-08-30 20:59:20 -04:00
Fox McCloud
4c6651fa72 fixes 2019-08-24 20:13:09 -04:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
Fox McCloud
41560d6e99 Merge pull request #11484 from KasparoVy/double_down 
Re-add The Ability to Natively See in the Dark
 2019-08-04 18:47:08 -04:00
Ty-Omaha
c67a98a50e fixes notes 2019-07-28 13:10:27 -04:00
variableundefined
96cd20430b Merge pull request #11687 from Kyep/you_have_time 
Public Time & Security
 2019-07-12 18:20:34 +08:00
Couls
e3a19841d9 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-22 03:54:43 -04:00
Kyep
8db416a2b5 public time, seclevel 2019-06-05 13:08:58 -07:00
Mark van Alphen
cd362d6bad Wormhole jaunter fix (and replace lighting checks with simulated) and disk compartmentalizer fix 2019-06-03 21:44:01 +02:00
Couls
5979166f54 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-02 21:59:58 -04:00
Mark van Alphen
81c325262d Fix Ash Walkers mining and antag selection, fix Lavaland Syndicate base incinerator buttons and comms agent mask 2019-06-02 01:18:18 +02:00
KasparoVy
2f29bbe0f7 Refactor sync_nightvision_screen() into sync_lighting_plane_alpha() 
Done to avoid having to manually write in the call of the proc since it is needed everywhere sync_lighting_plane_alph() is anyhow.
 2019-05-31 02:00:43 -04:00
KasparoVy
3d646deb4d Returns Darksight Functionality 
Returns the ability to see in the dark. see_in_dark determines how far you can see into absolute darkness, both for examining tile contents and visuals.
 2019-05-31 01:59:51 -04:00
Mark van Alphen
b65fbb907e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
 2019-05-30 19:35:52 +02:00
variableundefined
e8d13fec44 Merge pull request #11524 from Fox-McCloud/the-end 
The End
 2019-05-27 19:45:51 +08:00
Couls
fe68c74466 Merge branch 'master' into diagonal-movement 2019-05-22 14:24:54 -04:00
Mark van Alphen
2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
 2019-05-17 17:37:18 +02:00
variableundefined
1e62ac30ad Merge pull request #11439 from Arkatos1/LingIcons 
Changeling Evolution - Action Buttons!
 2019-05-17 19:15:16 +08:00
Fox McCloud
68effd9d83 The End 2019-05-13 17:22:57 -04:00
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
Arkatos1
1c74f848e1 Merge https://github.com/ParadiseSS13/Paradise into LingIcons 2019-05-10 14:41:08 +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
Arkatos1
6020d1d397 Merge https://github.com/ParadiseSS13/Paradise into LingIcons 2019-05-04 15:27:48 +02:00
Couls
fb619648a9 Resolve conflicts 2019-05-03 22:28:04 -04:00
Mark van Alphen
bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02: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
Twinmold93
fe0c04534f Moved to MC Tab 
Moves the time stamp to the MC Tab per Fox's request.
 2019-05-02 12:59:05 -05:00
Arkatos1
2e4de13f0f Initial commit 2019-05-02 01:30:17 +02: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
Twinmold93
726e0af91a rebase 2019-04-29 23:43:32 -05:00
variableundefined
5b98e861f0 Merge pull request #11299 from Kyep/ssd_auto_cryo_option 
Better SSD management
 2019-04-30 11:29:49 +08: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
Couls
a8db26df98 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-04-25 23:45:08 -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
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
Couls
a188a6b890 change some move procs 2019-04-23 05:56:12 -04:00
Couls
7eb7d723f9 Implement keybinding system and remove old hotkey modes 2019-04-23 01:31:03 -04:00
Kyep
d61d8a3dc1 new feature: ssd warning system 2019-04-22 21:38:47 -07:00
Arkatos1
b0182639b2 Adds an option to grant Martial Arts via Var menu 2019-04-19 16:54:59 +02:00
joep van der velden
9166de2a3d puke update 2019-04-13 10:56:30 +02:00
joep van der velden
55282f15d6 less puke related lag 2019-04-12 22:58:11 +02:00