cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-28 19:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 11 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

9304 Commits

Author SHA1 Message Date
Zuhayr
b3fc3a4a15 Fucking Hell I'm an idiot. 2014-07-13 06:34:22 -04:00
unknown
7afc2a50d4 Makes the cargo console force launch command more obvious 2014-07-13 06:34:06 -04:00
mwerezak
cf05d11854 Status displays now won't blank when undocking, too 2014-07-13 06:27:31 -04:00
mwerezak
e8b9375887 Allows escape pods to be armed from inside the pod 
Conflicts:
	code/game/machinery/embedded_controller/simple_docking_controller.dm
 2014-07-13 06:27:01 -04:00
Zuhayr
0266582acb Missed a linebreak. 2014-07-13 06:22:39 -04:00
Zuhayr
197fc0c36c Cleans up some of the lore issues with Mutiny. 
Conflicts:
	code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
 2014-07-13 06:22:30 -04:00
Zuhayr
1b1961b4fd Changed Mutiny messages to use the existing Centcomm message format. 
Conflicts:
	code/game/gamemodes/mutiny/mutiny.dm
 2014-07-13 06:21:10 -04:00
mwerezak
3f7a6286b8 Improves the display of shuttle ETAs 
Conflicts:
	code/controllers/emergency_shuttle_controller.dm
 2014-07-13 06:09:33 -04:00
mwerezak
7e64846a95 Improves suit cooler 
Adds a few vars items should have, e.g. throwforce, flags, etc. Also
origin_tech.
 2014-07-13 05:54:02 -04:00
Zuhayr
b148235669 Wtf how did this line even get deleted. 2014-07-13 05:47:38 -04:00
Zuhayr
fe1cf5ef77 Oversight with table fix. 2014-07-13 05:47:21 -04:00
Zuhayr
92192021af Compile fix. 2014-07-13 05:45:43 -04:00
Zuhayr
02a7109037 Fixes #5434 2014-07-13 05:45:23 -04:00
Zuhayr
03ca219356 Fixes #5443 2014-07-13 05:43:53 -04:00
ZomgPonies
92940e1c00 Running tests and cleaning out useless debug verbs/procs. 2014-07-13 05:32:40 -04:00
Zuhayr
661f4002a9 Fixes #5113 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2014-07-12 22:06:16 -04:00
Zuhayr
d4b954ddc5 Fixes #5188 
Conflicts:
	code/game/machinery/OpTable.dm
 2014-07-12 22:03:55 -04:00
Zuhayr
3ee3937bd8 Fixed lathes eating multitools and wirecutters when open. 
Conflicts:
	code/game/machinery/autolathe.dm
 2014-07-12 22:02:12 -04:00
Zuhayr
9d96b16c74 Fixes an access issue with the ID computer. 2014-06-29 21:21:36 -04:00
mwerezak
117221b0d5 Adds the ability to force launch escape pods 
Also reduces their countdown from 15 to 10 seconds.

Conflicts:
	maps/tgstation2.dmm
 2014-06-29 12:07:13 -04:00
Zuhayr
baeb58afd5 Fixed moving between tables freely. 2014-06-29 12:04:47 -04:00
Zuhayr
e203cce645 Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing. 
Conflicts:
	code/game/objects/structures.dm
 2014-06-29 12:03:39 -04:00
ZomgPonies
26321b62db No combat punch for non-lethal gygax 2014-06-29 11:58:59 -04:00
ZomgPonies
920750d8f5 Merge pull request #289 from Regen1/Small-changes 
+1 window crush
 2014-06-28 09:22:51 -04:00
Regen
d708eeec06 +1 window crush 
Added another layer of window crushing
For extra robust
 2014-06-28 15:20:17 +02:00
ZomgPonies
1103e5f5dc Oops 2014-06-27 18:24:07 -04:00
ZomgPonies
399e4909d6 The death of assistants. Long live civilians! 2014-06-27 17:57:18 -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
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
mwerezak
1284dc85c5 Fixes shuttle consoles not checking access 
Generalizes machine access.
 2014-06-26 07:40:51 -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
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
Necaladun
ee0d117b36 Powers changes 
PPI's tweak to invisibility and attempt add adminlogging to cryokinesis
 2014-06-26 07:28:46 +09:30
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
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
ZomgPonies
a3e33913d4 Fix lamps/greenlamps. I should have done this ages ago. 2014-06-25 08:05:20 -04:00
ZomgPonies
441f553f9b Runtime fix 2014-06-25 00:13:16 -04:00
Chinsky
71169c7903 Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand(). 
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.

Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
 2014-06-24 12:02:29 -04:00
mwerezak
bd339f6156 Replaces the emergency shuttle control console 
Replaces the old emergency shuttle control console with a nice new
NanoUI one. Improves the NanoUI for the docking controllers.

Conflicts:
	maps/tgstation2.dmm
 2014-06-24 07:10:28 -04:00
mwerezak
e6944b989c Adds shuttle controller 
Moves all ferry shuttle processing into one place: the new shuttle
controller.

Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.

Conflicts:
	code/controllers/master_controller.dm
	code/controllers/verbs.dm
	code/game/supplyshuttle.dm
	code/modules/shuttles/shuttle.dm
 2014-06-24 07:06:48 -04:00
Zuhayr
727d7400ee Shuffling around table and crate knock/climb procs. 
Conflicts:
	code/game/objects/structures.dm
 2014-06-24 06:59:42 -04:00
Zuhayr
a06621b7af Makes table/crate falling a bit more dangerous. 2014-06-24 06:56:07 -04:00
Zuhayr
7ad261bd2f Allows climbing onto tables and crates, also adds falling off if you are dumb enough to stand on one that is flipped or opened. 
Conflicts:
	code/game/objects/structures/tables_racks.dm
 2014-06-24 06:52:13 -04:00