cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 12:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,265 Commits 26 Branches 2 Tags
4da65639b83f4e5f017f299c8a7651d9aa75aeb6
Commit Graph

13239 Commits

Author SHA1 Message Date
Zuhayr
4da65639b8 Drones now have plasma cutters instead of emags. 2014-06-24 12:11:52 -04:00
Zuhayr
ea2395b848 Fixes #5323 2014-06-24 12:11:04 -04:00
Zuhayr
519f3397d3 Added extra bit of info to drone spawn. 
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
 2014-06-24 12:10:38 -04:00
Zuhayr
a2fde000b6 Removed ability for drones to talk on Binary. 
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
 2014-06-24 12:04:31 -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
Chinsky
d1932f7045 Moved same code into single organ helper to handle embedding. 
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/organs/organ_external.dm
 2014-06-24 11:46:56 -04:00
Chinsky
0626abe799 Lowers caused damage to make it destroy organs rarer. 2014-06-24 11:42:45 -04:00
Chinsky
2cf6acd4e7 Monkey cube now expand when eaten, leading to !!FUN!! 2014-06-24 11:42:34 -04:00
mwerezak
eb86081165 Adds direction arg for area/move_contents_to() 
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays

Conflicts:
	code/modules/shuttles/shuttle.dm
	code/setup.dm
 2014-06-24 07:26:03 -04:00
mwerezak
d6e768fbfd Fixes escape shuttle not transitioning 
Conflicts:
	code/modules/shuttles/shuttle.dm
 2014-06-24 07:12:11 -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
ZomgPonies
05507b6ce6 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-24 06:48:40 -04:00
Mloc-Argent
69d9d9fc49 atmos: make fires more destructive 
Fires can now burn through walls, windows, and (with a high enough
 temperature) rwalls.
New proc: adjacent_fire_act().  Called on turfs that a fire isn't able
 to spread to. (walls, floor surrounded by windows, etc.)

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/objects/structures/window.dm
 2014-06-24 06:48:08 -04:00
Mloc-Argent
511d695fad turf: adds a damage model for walls 
New proc for walls: take_damage().
Damage is tracked in the "damage" var, walls will break if "damage"
 hits "damage_cap".
Damage can be repaired with a weldingtool.
Damage overlays are cached in the global wall var "damage_overlays"
 to reduce overhead.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/turfs/simulated/walls.dm
	icons/turf/walls.dmi
 2014-06-24 06:43:41 -04:00
Mloc-Argent
5e45a8c8ce atmos: fix a geometry error 
reverse_dir is a list of reversed dir fields

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-06-24 06:37:46 -04:00
Hubblenaut
b66631e360 Moves the non-implanted security positions from restricted to protected list, adds IA Agent to restricted. 
Conflicts:
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/revolution/revolution.dm
 2014-06-24 06:36:15 -04:00
DJSnapshot
fc9143051f Clicking the magnetic card slot option on the desktop will eject all cards. No more eating cards! 2014-06-24 06:31:32 -04:00
Necaladun
9f0d9dc491 Access for Embassies 
Embassy ID locks - 120-127
 2014-06-24 12:57:11 +09:30
Necaladun
9b5bb0c1dc Area tags for embassies 
Area tags and fugly images
 2014-06-24 12:01:05 +09:30
ZomgPonies
a4f2b0af97 Fixed ambulance, added to map 2014-06-23 15:11:33 -04:00
ZomgPonies
7da1b056cf Waaaambulance 2014-06-23 14:23:59 -04:00
mwerezak
7e057e7eb9 Minor shuttle fixes and cleanup 
Readds the missing "shuttle has left the station" message, improves the
ETA calculation and reorganizes the procs in shuttle_controller.dm
 2014-06-23 11:10:28 -04:00
mwerezak
d8c02c7b6e Some fixes 
Conflicts:
	code/game/supplyshuttle.dm
 2014-06-23 11:09:14 -04:00
mwerezak
59f1cc3b0a Forgot to process shuttles 2014-06-23 11:08:31 -04:00
mwerezak
8a873b4a1c Adds escape pods to the controller 2014-06-23 11:08:15 -04:00
mwerezak
9874ce38ce shuttle_controller now uses a shuttle datum 
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/admin/verbs/randomverbs.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/power/singularity/singularity.dm
 2014-06-23 11:07:58 -04:00
mwerezak
55532e51a0 Supply controller now holds a ref to it's shuttle 
Instead of having to look it up every time.

Conflicts:
	code/game/supplyshuttle.dm
 2014-06-23 10:33:05 -04:00
ZomgPonies
4fc76945af Compile fix 2014-06-23 06:31:20 -04:00
DJSnapshot
615f81588a uses get_turf instead of get_turf_loc now 2014-06-23 06:23:11 -04:00
DJSnapshot
54bfc06609 Forgot to commit welcome.dm 2014-06-23 06:22:56 -04:00
DJSnapshot
35506b404f allows laptops to be recharged in rechargers. 
Conflicts:
	code/game/machinery/recharger.dm
 2014-06-23 06:22:41 -04:00
DJSnapshot
2d963b8a43 laptop vendor! 2014-06-23 06:17:59 -04:00
DJSnapshot
e55208bc69 fixes for potential runtimes. 2014-06-23 06:17:48 -04:00
DJSnapshot
21a1f2eefe laptop vending part 1. and more cleanup. 
Conflicts:
	icons/obj/computer3.dmi
 2014-06-23 06:17:36 -04:00
DJSnapshot
fbfecb0e99 lowercase ntos by request of mloc + updates to background. 2014-06-23 06:17:11 -04:00
DJSnapshot
54b2e5f7a7 Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do. 
Conflicts:
	code/datums/browser.dm
	html/browser/common.css
 2014-06-23 06:16:29 -04:00
ZomgPonies
f35d8d335d Paradise fixes to PR 2014-06-23 06:12:41 -04:00
DJSnapshot
8a33620554 Initial commit of Computer 3 from Paradise, along with a bunch of fixes. 
Conflicts:
	code/__HELPERS/unsorted.dm
	code/datums/browser.dm
	code/setup.dm
	icons/obj/computer3.dmi
 2014-06-23 06:02:36 -04:00
ZomgPonies
b8c1dbf620 Preparing repo for overhauled computer3 2014-06-23 05:52:00 -04:00
ZomgPonies
506bd94252 This should allow people to hear the lobby jukebox 2014-06-23 05:33:40 -04:00
ZomgPonies
3493fc0961 Forgot this 2014-06-23 04:48:34 -04:00
Loganbacca
6f75a88d16 Cargo train update 
- Cleans up some old code
- Fixes some bugs
- Adds keys to start the engine

Conflicts:
	code/modules/vehicles/cargo_train.dm
	code/modules/vehicles/train.dm
	code/modules/vehicles/vehicle.dm
	icons/obj/vehicles.dmi
 2014-06-23 04:47:57 -04:00
mwerezak
cbaaba0d9c Fixes #5193 2014-06-23 04:35:53 -04:00
ZomgPonies
ad27574f18 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-23 04:29:55 -04:00
ZomgPonies
096cae4dd4 Hopefully cut down on ressource size and speed up loading 2014-06-23 04:29:22 -04:00
Regen
1dd805e115 Jukebox more songs first iteration 2014-06-23 00:49:07 +02:00