cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 01:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,597 Commits 26 Branches 2 Tags
f7dcde22d781fd0bc0db35b51cd168b53075dba9
Commit Graph

48 Commits

Author SHA1 Message Date
Ty-Omaha
f7dcde22d7 sound2 2019-03-28 21:15:20 -04:00
Ty-Omaha
cd57438ec7 sound1 2019-03-28 21:00:54 -04:00
datlo
ff397236b7 Reword command 2018-12-24 11:52:03 +00:00
datlo
34d9559c2f add access restriction removal to keycard swiper 2018-12-24 09:26:46 +00:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Birdtalon
074ee967e5 Merge branch 'master' into ERT-changes 2018-10-07 19:22:10 +01:00
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Crazy Lemon
ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle 
Port Shuttle to StonedMC
 2018-10-01 01:13:42 -07:00
Birdtalon
1628467857 Merge branch 'master' into ERT-changes 
# Conflicts:
#	icons/mob/head.dmi
 2018-09-30 14:53:32 +01:00
Birdtalon
c72561d194 addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines 2018-09-29 20:29:26 +01:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
variableundefined
bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
tigercat2000
77519c926f Make sec levels avoid overwriting an admin-forced nightshift 2018-04-04 09:26:14 -07:00
tigercat2000
8e5a42a7a1 Merge remote-tracking branch 'upstream/master' into night_shift 
# Conflicts:
#	code/world.dm
 2018-04-02 17:24:36 -07:00
tigercat2000
aa8038c4e7 Merge pull request #8616 from Tayyyyyyy/shuttle_cheese 
Reduce shuttle cheese
 2018-04-01 18:48:31 -07:00
tigercat2000
e71c4279a7 Merge remote-tracking branch 'upstream/master' into night_shift 
# Conflicts:
#	paradise.dme
 2018-03-30 10:20:21 -07:00
Fox McCloud
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
tigercat2000
bc4fb3d79b Nightshifts & Randomized Station Time 
This commit adds the Nightshift lighting mode from /tg/. From 19:00 to
07:00 in station time, the station will go into a reduced-lighting mode,
with dimmed lights across the station.

In conjunction with this, there is a new configuration option to start
the shift time at a random time other than 12:00, so that players are
more likely to experience a night shift (as opposed to having to have a
7 hour round).
 2018-03-25 23:01:04 -07:00
Tayyyyyyy
15ff32f0df Reduce shuttle cheese 
Once you up to red, you have to wait 5 minutes before you can call the shuttle.
 2018-01-28 16:21:25 -06:00
tigercat2000
8a588d3aad Merge remote-tracking branch 'upstream/master' into radio_comms_fluff 2017-10-26 12:02:31 -07:00
Kyep
3e2c510cf1 Spawn Tweaks 2017-10-18 02:41:43 -07:00
tigercat2000
cd72dcd8a1 Air Traffic Control & Map Lore 
Air Traffic Control from Polaris. Every TBD to TBD minutes, a radio
exchange happens between a ship and Cyberiad Space Control, ranging from
system transfer permission to declaring an emergency.

Refactored MAP_NAME into /datum/map files. This also allows for built-in
map lore (really just the name and system, which is only used for ATC).

Secondary commit will adjust all of the lore to match our own instead of
Polaris's.
 2017-06-28 16:12:15 -07:00
Fox McCloud
7fd86096af More GC and Performance Fixes (#7248) 2017-05-06 23:48:18 -07:00
Fox McCloud
6eb5aef25e Merge pull request #7100 from AffectedArc07/patch-2 
Emergency Maint Access now makes more sense in announcements.
 2017-04-23 16:28:56 -04:00
AffectedArc07
cceabd1ecf Fixes capitalisation 2017-04-23 07:51:39 +01:00
AffectedArc07
e2ba73d9e7 Makes announcements make more sense 2017-04-14 18:35:00 +01:00
Mark van Alphen
06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01:00
davipatury
9eadc35e35 Comms program. 2017-02-21 12:37:28 -03:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
Crazy Lemon
2a209f62cd Merge pull request #5814 from Markolie/ann2 
Announcement refactor
 2017-01-18 19:17:30 -08:00
Crazylemon64
f954382619 Adds a ui_key arg to ui_data 2016-12-31 12:51:07 -08: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
4ed58cc839 Remove newscast from two missed announcements 2016-10-25 19:50:05 +02:00
Markolie
79be3ca8cf Fix up a number of ID checks 2016-10-23 15:49:02 +02:00
Crazylemon64
7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Fox-McCloud
0c4e7e48c5 Removs Airlock World Calls 2016-08-02 22:44:27 -04: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
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Kyep
5454011593 Fixes trialmin bug, adds ERT response reminder 2016-07-06 23:47:08 -07:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
Kyep
3325823aa9 Added Gamma/Delta/Epsilon alert icons 2016-01-18 02:31:24 -08:00
Markolie
0b030a63bd Remove spaces from module files 2015-09-27 07:32:07 +02:00