cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-13 11:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,331 Commits 27 Branches 2 Tags
28a1e35f8029ff2a2d893220fbbacd375cbdc8ec
Commit Graph

13288 Commits

Author SHA1 Message Date
Zuhayr
28a1e35f80 As far as I can tell, viral infections were happening irrespec 
tive of medical crew being present. Lowered chance for proc as well.

Conflicts:
	code/modules/events/event_dynamic.dm
 2014-06-26 21:58:46 -04:00
mwerezak
d3c35251bb Fixes macro escape slashes 
Derp.

Conflicts:
	code/controllers/shuttle_controller.dm
 2014-06-26 21:20:33 -04:00
mwerezak
9079bb353e Improves the fix for shuttles being stuck if... 
... the docking controller is destroyed.
 2014-06-26 21:19:13 -04:00
ZomgPonies
cb9b6fca4d Replacing civilian with support department. Still need to make changes on MySQL schema. 2014-06-26 19:42:14 -04:00
ZomgPonies
7ab91efdff ERT shuttle fix 2014-06-26 18:44:45 -04:00
mwerezak
d2837379d4 Fixes ERT shuttle not announcing a cancelled... 
...launch if the launch is cancelled after the countdown is completed.
 2014-06-26 18:23:55 -04:00
mwerezak
f5f4682b8e Updates secrets panel to use the new shuttle... 
...datum correctly.

Conflicts:
	code/modules/admin/admin.dm
 2014-06-26 16:58:07 -04:00
mwerezak
05c5f81b97 Fixes base shuttle console requiring engine access 2014-06-26 16:53:32 -04:00
mwerezak
38bf6b59c4 Fixes shuttles getting stuck if the docking... 
...controller they are trying to dock with has been destroyed or is not
responding.
 2014-06-26 16:53:11 -04:00
mwerezak
ebe81e4cfb Improves shuttle ETA calculation 2014-06-26 16:52:59 -04:00
Necaladun
ce4066c936 Minor map tweaks and NGS-> NCS 2014-06-27 05:30:52 +09:30
ZomgPonies
deebd7f37c Merge pull request #284 from Regen1/Fuck-Spider-virus 
Comment out Spider virus effect
 2014-06-26 15:23:15 -04:00
Regen
38171314e9 Comment out Spider virus effect 2014-06-26 21:22:01 +02:00
ZomgPonies
fab8d7234b Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-26 15:13:27 -04:00
ZomgPonies
02395a5273 Missing debug controller 2014-06-26 15:09:16 -04:00
Necaladun
c18e3cfc80 Various minor 
Drug dealer changed to pharmacologist to avoid breaking bad wannabes.

NGS - NCS Cyberiad

Rubby Duck Crates
 2014-06-26 23:48:14 +09:30
ZomgPonies
64023f1260 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-26 08:07:49 -04:00
mwerezak
1284dc85c5 Fixes shuttle consoles not checking access 
Generalizes machine access.
 2014-06-26 07:40:51 -04:00
mwerezak
be27a08c3a Adds escape pod docking controllers 
Conflicts:
	maps/tgstation2.dmm
 2014-06-26 07:40:36 -04:00
mwerezak
59fd7a1f18 Adds escape pod docking controller type 
Escape pods now no longer launch automatically during regular crew
transfers. However they can be set to launch during a regular crew
transfer by emagging the escape pod controller.

Also fixes emergency shuttle arrival announcement having the wrong ETD.

Conflicts:
	code/controllers/emergency_shuttle_controller.dm
	maps/tgstation2.dmm
 2014-06-26 07:40:15 -04:00
mwerezak
b67c56ff5a Improves multi-airlock docking UI 2014-06-26 07:35:44 -04:00
mwerezak
d68f682bc3 Improves simple docking controller UI 2014-06-26 07:35:32 -04:00
mwerezak
02cc93392f Adds escape shuttle docking controllers 
Conflicts:
	maps/tgstation2.dmm
 2014-06-26 07:35:12 -04:00
mwerezak
b39093732b Fix for long_jumps never leaving transition area 
The previous behaviour of move() called without arguments assumed a
short_jump, which meant that the wrong origin area would be used.
 2014-06-26 07:34:32 -04:00
ZomgPonies
e4a6de6c58 Fixing other people's fuckuups 2014-06-26 07:31:21 -04:00
mwerezak
3033668671 Adds multi-airlock docking controller 
Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
 2014-06-26 07:31:07 -04:00
mwerezak
447ad5c3c7 Fixes airlocks being stuck if they run out of air 2014-06-26 07:15:04 -04:00
mwerezak
ef0e9c50e9 Fixes missing announcements, bad returned() check 
Also fixes some bad grammar in the shuttle authorization announcements, and reduces the number of authorizations required to 2. 3 seemed a bit high.

Conflicts:
	code/controllers/emergency_shuttle_controller.dm
 2014-06-26 07:14:40 -04:00
mwerezak
1845749c1a Fixes #5351 
Multi-shuttle origin was being assigned a path, not an actual area.
 2014-06-26 07:12:13 -04:00
Bram961
32db2665a4 Permanent brain exposure fix 
A fix too the permanent brain exposure glitch, now brain exposure can be
fixed by setting the skull
 2014-06-26 12:13:01 +02:00
Necaladun
ee0d117b36 Powers changes 
PPI's tweak to invisibility and attempt add adminlogging to cryokinesis
 2014-06-26 07:28:46 +09:30
ZomgPonies
592fe0a696 New ambulance sprite 2014-06-25 17:54:34 -04:00
ZomgPonies
1b34c52806 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-25 16:29:46 -04:00
ZomgPonies
bded19984f Fixing PDA stuff 2014-06-25 16:23:02 -04:00
alex-gh
6b230d693f Runtime fixes 2014-06-25 21:20:54 +02:00
ZomgPonies
adfa2ca902 And another one, I'll remove them one by one until I find the one that works. 2014-06-25 13:21:09 -04:00
ZomgPonies
23d6889a28 Trying to fix lobby jukebox 2014-06-25 13:19:56 -04:00
ikarrus
73cc0fca34 -Securitrons will declare the threatlevel of the perp when making an arrest/detention 
-emagging will turn declarations off
-People with criminal status "Incarcerated" or "Parolled" will increase threatlevel

Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
 2014-06-25 09:32:44 -04:00
ikarrus
50bf910867 Securitron Update 
-Added a new access type that will act as a weapon permit that the HoS/HoP can manage. Centcom, Security, Captain, HoP, and the Barman start with it.
-Securitrons will now have the option to declare arrests they make to anyone who is wearing a security HUD. This can be turned off per-securitron
-Securitrons now have the option to arrest humans without any IDs. Defaults to off.
-Changed how securitron threat assessment is calculated
-Removed detective access from securitrons
-Stunning and cuffing now properly bolds their text for the perp
-Pingsky has its own type now

I realise there is a lot of existing duplicate code between the EDs and the securitrons, but I don't think I'd have the capability to tackle that any time soon.

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/jobs/access.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/security.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
	code/modules/admin/verbs/debug.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
 2014-06-25 09:30:08 -04:00
Zuhayr
1f7638e243 Couple of small tweaks. 
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
 2014-06-25 08:42:22 -04:00
ikarrus
c9dd900ebf The Select-Equipment admin verb now includes all jobs 
Useful for admins and coders alike.

Conflicts:
	code/modules/admin/verbs/debug.dm
 2014-06-25 08:32:52 -04:00
ZomgPonies
a3e33913d4 Fix lamps/greenlamps. I should have done this ages ago. 2014-06-25 08:05:20 -04:00
ZomgPonies
d4bfbda9f3 Moar trying to get the lobby jukebox working. 2014-06-25 07:04:58 -04:00
Zuhayr
7fe1c6cb0e Update distribution.dm 2014-06-25 06:16:02 -04:00
Zuhayr
7f96a7d6bc Mining tweaks, removal of debug/cruft, balancing of values. 2014-06-25 06:15:49 -04:00
ZomgPonies
2e01db3366 Trying to make jukeboxes start playing before roundstart. 2014-06-25 06:14:46 -04:00
ZomgPonies
441f553f9b Runtime fix 2014-06-25 00:13:16 -04:00
ZomgPonies
e58f5eda41 Derpderp 2014-06-24 21:18:19 -04:00
ZomgPonies
0e8bb2a6b4 Hotfix for rounds not ending 2014-06-24 21:16:18 -04:00
Zuhayr
4da65639b8 Drones now have plasma cutters instead of emags. 2014-06-24 12:11:52 -04:00