cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 21:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,798 Commits 26 Branches 2 Tags
ec4add0ebfa3a02003fc6abfb801a88dfdca56e8
Commit Graph

195 Commits

Author SHA1 Message Date
Crazy Lemon
2a209f62cd Merge pull request #5814 from Markolie/ann2 
Announcement refactor
 2017-01-18 19:17:30 -08:00
Crazylemon64
ec0f13d41e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:01:43 -08:00
Crazylemon64
f954382619 Adds a ui_key arg to ui_data 2016-12-31 12:51:07 -08:00
Markolie
1f243ec4f0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/_globalvars/lists/objects.dm
 2016-12-31 17:54:06 +01:00
Fox McCloud
761fc99bb8 Merge pull request #6032 from Crazylemon64/ghost_gateway_fix 
Ghosts can now click on the home gateway to teleport
 2016-12-31 01:47:45 -05:00
Aurorablade
98b7a89a17 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 
# Conflicts:
#	code/game/machinery/doors/airlock.dm
 2016-12-29 11:01:43 -05:00
Crazylemon64
67cb9ab4b1 Ghosts can now click on the home gateway to teleport 
The away mission gateways still worked
 2016-12-24 22:42:47 -08:00
Aurorablade
e25ddf8329 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-24 00:18:40 -05:00
Markolie
e2587dbbbf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm
 2016-12-23 19:04:35 +01:00
Tigercat2000
b9abce843d NanoUI Update: Seperate UI Data into ui_data() proc 
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.

To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
 2016-12-14 13:37:34 -08:00
Markolie
ffc74cda0a Announcement fixes, change most command announcements to event announcements 2016-10-25 15:21:16 +02:00
Aurorablade
e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
Aurorablade
864a9ba612 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-10-07 23:51:48 -04:00
Crazylemon64
d85eab037d The maploader now yells when you give it a bad path or empty file 2016-09-21 19:42:38 -07:00
Aurorablade
b00ce51135 THERE IS TOO A DOCKING PORT URGGHHH 2016-09-19 08:47:43 -04:00
Aurorablade
f1aada7ea1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-09-11 19:50:53 -04:00
monster860
58f8d7ec9b Fix hotel SNPC's getting access they shouldn't. 2016-09-01 17:34:51 -04:00
Aurorablade
2c104adaf3 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-09-01 00:43:50 -04:00
Crazylemon64
666a2f15fa Fixes minor formatting gripes 2016-08-26 17:07:01 -07:00
Crazylemon64
b633cf53af Moves from log_debug to log_runtime for non-fatal abberant states 2016-08-23 17:03:52 -07:00
Aurorablade
080c02af87 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-23 00:53:31 -04:00
Fox-McCloud
9429949619 Mining Area Tweak 2016-08-21 06:10:51 -04:00
Aurorablade
47dc3a3051 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-16 02:23:20 -04:00
Tigercat2000
58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm
 2016-08-10 14:16:42 -07:00
Tigercat2000
0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/objective.dm
 2016-08-08 06:21:02 -07:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07:00
Fox McCloud
b1c87f319d Merge pull request #5316 from Crazylemon64/map_writer 
Adds a "Save" buildmode
 2016-08-08 02:34:02 -04:00
Crazylemon64
342fcad5d5 All is ablaze 2016-08-07 13:43:15 -07:00
Crazylemon64
360f073609 Removes buffer_line, makes model saving for cluttered tiles quick 2016-08-07 13:36:18 -07:00
Crazylemon64
ffd47933e5 Map writer is now legible in DM, saves 19x faster 2016-08-07 12:02:43 -07:00
Crazylemon64
a9f3d0464e Makes the json-maploader legible in DM 2016-08-06 17:40:33 -07:00
Fox-McCloud
03eb9be741 Atom Say Refactor 2016-08-06 06:45:20 -04:00
Crazylemon64
40fe120067 Whoops 2016-08-03 20:04:14 -07:00
Crazylemon64
2f3e529db0 No more lighting overlays 2016-08-03 19:44:47 -07:00
Crazylemon64
05a95086bd Comments bgone 2016-08-03 19:07:23 -07:00
Crazylemon64
3fbb00d5f7 Can now save and load the cyberiad 2016-08-03 18:58:41 -07:00
Crazylemon64
87cde9f61c The map writer now works on small chunks of the station 2016-08-03 15:38:08 -07:00
Crazylemon64
f0a7d19240 Map writer works! 2016-08-03 14:55:29 -07:00
Crazylemon64
471a5ecca1 First pass at a functioning map writer 2016-08-03 13:26:22 -07:00
Tigercat2000
9f3cdb43f7 special_role/objective refactor 
Refactored most instances of special_role setting/checking to use new
SPECIAL_ROLE_X defines in code/__DEFINES/gamemode.dm

Removed relative pathing from objective.dm and split large if statements
into multiple, plus a bunch of styling fixes

Refactored every instance of `istype(ticker.mode` into a GAMEMODE_IS_X
define in code/__DEFINES/gamemode.dm. Done primarily for when someone gets
around to making gamemode code less AWFUL
 2016-08-01 21:29:19 -07:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Aurorablade
bb840f4dce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-07-21 23:56:34 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins 
Crazypilot's Space Ruins Port
 2016-07-15 22:55:51 -04:00
Crazylemon64
9752de5484 species path to species name 2016-07-15 10:13:32 -07:00
Fox McCloud
c803c4f752 Merge pull request #4911 from Kyep/exile_option 
Makes Exile & Lethal Injection Viable
 2016-07-11 21:21:16 -04:00
Kyep
35de9d2d69 Changed exile implants locker to armory access 2016-07-09 17:38:02 -07:00
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 
All hail glorious leader tigercat
 2016-07-08 00:16:28 -07:00
Crazylemon64
20eee9064c Fixes init on various things, as well as allowing the 
map loader to safely load templates mid-run
 2016-07-07 23:52:44 -07:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00