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
Walter0o
570fd2756b robot computer emagging exploit fix 
so an emagged borg can in turn emag all others ?
the more you know.
seems extremely OP to me but i am just closing the exploit, not changing the game.
Conflicts:
	code/game/machinery/computer/robot.dm
 2014-08-03 15:06:16 -04:00
ZomgPonies
a1a866d8e4 Revert "Fixes #5202" 
This reverts commit a94761c5c4.
 2014-08-03 14:59:13 -04:00
Zuhayr
a94761c5c4 Fixes #5202 2014-08-03 14:56:53 -04:00
Bone White
9d664e9d1a Longer time taken to drill a pipe through a r_wall 
Added a message too to the driller that it's going to take a while.
 2014-08-03 19:28:48 +01:00
Bone White
e3ca0f3f6e Allows the sliding of pipework along floors 
Allows pipes to be slid along the floor, not only does this make laying
pipes easier, but you can now lay pipes under machinery without having
to remove them.
 2014-08-03 19:23:21 +01:00
ZomgPonies
65f099b0c9 Merge pull request #351 from Bone-White/master 
Allows the insertion of pipework into walls
 2014-08-03 14:03:42 -04:00
Bone White
0bf9f46d1f Allows the insertion of pipework into walls 
Pipes will be visible above the wall, allows for easier atmos repairs.
Atmos pipes installed this way can be unwrenched as normal.  Walls are
unaffected.
 2014-08-03 11:36:39 +01:00
ZomgPonies
cb441541f5 Added vampire HUD 2014-08-03 01:27:36 -04:00
Zuhayr
2c6c68b7aa Adjusted gas exude code. 
Conflicts:
	code/game/machinery/hydroponics.dm
 2014-08-02 22:37:05 -04:00
Zuhayr
6b51c43694 Adjusted process_reagents() so hydro trays are refillable with water and nurients when the tray is dead/empty. 2014-08-02 22:34:33 -04:00
Zuhayr
ceb7cb9419 Reapplying some fixes that I think DM may have saved over, whoops. 2014-08-02 22:34:17 -04:00
Zuhayr
23ef5530de Changed hydro trays, fertilizer and syringes over to use the reagent procs. 
Conflicts:
	code/game/machinery/biogenerator.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	maps/tgstation2.dmm
 2014-08-02 22:33:47 -04:00
MrSnapwalk
75b2ca2dd2 Psychiatrist/Psychologist update. 
Conflicts:
	code/game/jobs/job/medical.dm
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2014-08-02 22:23:39 -04:00
ZomgPonies
ca5f2103f0 Removing the gaz stuff from botany 2014-08-02 22:09:41 -04:00
Zuhayr
41ba5f318a More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues. 2014-08-02 22:05:10 -04:00
ZomgPonies
6e925c0e50 Merge pull request #350 from VampyrBytes/master 
several fixes inc #233
 2014-08-02 18:58:27 -04:00
SamCroswell
877a48f982 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-08-01 10:03:35 -04:00
SamCroswell
a860241f96 Rigged up unused warning stripe decals, we no longer require specific turfs for warning stripes. 2014-08-01 09:57:57 -04:00
VampyrBytes
ea07c3b06b several fixes inc #233 
Fixes icon creation issue in certain situations such as humanising
monkeys and cloning
Fixes humanized monkeys reverting to monkey name after being used for
cloning
Fixes humanized monkeys being made as human parent object instead of
human/race
 2014-08-01 06:38:01 +01:00
Rob Nelson
61cba51494 Vending machine href exploit fix 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/vending.dm
 2014-08-01 01:12:25 -04:00
mwerezak
929e3fb1fd Allows escape shuttle to scan IDs from within UI 
Fixes #5592

Conflicts:
	nano/templates/escape_shuttle_control_console.tmpl
 2014-08-01 01:00:09 -04:00
ZomgPonies
1b2e61f3d0 Bugfixes 2014-07-31 19:42:07 -04:00
Rob Nelson
7832e1c26f PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN 
Conflicts:
	.gitignore
	baystation12.dme
	code/_onclick/hud/screen_objects.dm
	code/modules/clothing/spacesuits/alien.dm
	code/modules/media/tapedeck.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	html/changelog.html
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/in-hand/in-hand_sync_report.txt
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/tank.dmi
 2014-07-31 18:58:49 -04:00
PsiOmega
03e7aaba81 Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them. 
Conflicts:
	baystation12.int
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2014-07-31 17:38:14 -04:00
ZomgPonies
742bc8c9b3 Merge pull request #345 from SamCroswell/master 
Alien Tweaks, Commented Out Detomatix
 2014-07-30 22:59:12 -04:00
SamCroswell
94dbad82a4 Alien Tweaks, Commented Out Detomatix 2014-07-30 00:53:56 -04:00
ZomgPonies
9ac64815a1 Goddamnit 2014-07-30 00:21:26 -04:00
mwerezak
8843b7f757 Sound fixes 
Conflicts:
	code/game/sound.dm
 2014-07-30 00:19:56 -04:00
PsiOmega
2436478804 An Odysseus with patients now bypass mech movement-overrides. 2014-07-30 00:17:48 -04:00
ZomgPonies
1bd2acf0d0 Revert "More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues." 
This reverts commit 95b069b7d4.
 2014-07-30 00:16:53 -04:00
Zuhayr
95b069b7d4 More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues. 2014-07-29 14:44:34 -04:00
Zuhayr
a7ffa5747b Fixed diona pods being mutable, fixed a few other tweaks, added cuttings. 2014-07-29 14:44:15 -04:00
ZomgPonies
5fa14b8391 Merge pull request #342 from Robertha89/patch-1 
Update vampire.dm
 2014-07-28 17:20:18 -04:00
ZomgPonies
17da01a00b Merge pull request #341 from Robertha89/patch-4 
Update cult.dm
 2014-07-28 17:20:04 -04:00
ZomgPonies
784297b39b Merge pull request #340 from Robertha89/patch-3 
Update changeling.dm
 2014-07-28 17:19:59 -04:00
Robertha89
be32d28719 Update cult.dm 
Add Security Pod Pilot, Nanotrasen Recruiter and Magistrate where appropriate.
 2014-07-28 23:09:09 +02:00
Robertha89
ca6e85defa Update changeling.dm 
Add Security Pod Pilot, Nanotrasen Recruiter and Magistrate where appropriate.
 2014-07-28 23:09:06 +02:00
Robertha89
ecbd008112 Update traitor.dm 
Add Security Pod Pilot, Nanotrasen Recruiter and Magistrate where appropriate.
 2014-07-28 23:09:02 +02:00
Robertha89
a4680ac5c3 Update vampire.dm 
Add Security Pod Pilot, Nanotrasen Recruiter and Magistrate where appropriate.
 2014-07-28 23:09:01 +02:00
ZomgPonies
75c691f112 Fix jackboot sound 2014-07-28 14:17:48 -04:00
ZomgPonies
be8da47760 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-28 13:52:51 -04:00
ZomgPonies
d76c95d435 Merge pull request #338 from VampyrBytes/master 
fixes #295
 2014-07-28 13:52:37 -04:00
Zuhayr
d1059b488b Bevy of newhydro fixes. 
Conflicts:
	code/game/machinery/vending.dm
	code/modules/projectiles/guns/energy/special.dm
	icons/obj/hydroponics.dmi
 2014-07-28 13:49:18 -04:00
Loganbacca
0affd2b7c8 More train fixes 
- No passing plastic flaps
- Only human based mobs can board trains
- Adjacent checks for exiting vehicles
- Cleaned up as many direct loc moves as possible
- Places removed cells in the removers hand
 2014-07-28 13:34:50 -04:00
PsiOmega
45bcd41b9d Area naming consistency 
Changes area name from "supply shuttle" to "Supply Shuttle" to match the casing of other areas.
 2014-07-28 13:34:09 -04:00
DJSnapshot
006365d815 now you can hear next to you in space! 
Conflicts:
	code/game/sound.dm
 2014-07-28 13:33:31 -04:00
DJSnapshot
f52ece0c1d Big nerf and cleanup of 3D sound. should fix most of #5789 
Conflicts:
	code/game/sound.dm
 2014-07-28 13:28:23 -04:00
ZomgPonies
98963c336f Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-28 13:24:44 -04:00
PsiOmega
ea378b3bb5 Attempts to ensure that the captain (or the head loyalist to be precise, whomever he might be) is not a candidate for the directives. 
Conflicts:
	code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
	code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
 2014-07-28 13:24:38 -04:00
alex-gh
5b75ca3a11 Possibly improved /turf/simulated/Entered() performance 2014-07-27 23:11:49 +02:00