cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-02-06 14:48:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,433 Commits 31 Branches 2 Tags
dbdc032e497b2f5e01f3aa2456944201cf7be4fd
Commit Graph

6896 Commits

Author SHA1 Message Date
Zuhayr
c46505f633 Stops drones from self-destructing or being locked down by the RD console. 2014-05-12 03:08:55 -04:00
Zuhayr
450beac5a9 Fixes a runtime with drones building lights. 2014-05-12 03:03:37 -04:00
Zuhayr
1af09fbfba Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 
Conflicts:
	baystation12.dme
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/projectiles/guns/projectile/bow.dm
	icons/obj/gun.dmi
 2014-05-12 02:59:53 -04:00
Zuhayr
d606d774d8 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/examine.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/recycling/disposal.dm
	icons/mob/robots.dmi
	icons/obj/device.dmi
 2014-05-12 01:41:02 -04:00
SamCroswell
c4d7c91e76 Map Bugfixes, some past due Ninja changes 2014-05-10 22:25:58 -04:00
ZomgPonies
48f00ee263 Revert "Thermite Effectiveness Scaling with Volume" 
This reverts commit 9a66fd7edd.

Conflicts:
	code/game/turfs/simulated/walls.dm
 2014-05-07 19:54:01 -04:00
Ccomp5950
fafde6dd15 [Bugfix] Fixes partial prints. 
Playays will now no longer leave complete prints from touching an item once.

Instead they will leave a partial print, that has a high chance of leaving more and more with each touch.

You have a 1/100 chance of leaving a full set of prints on your first touch.

Fixes #4176
 2014-05-07 16:12:51 -04:00
Zuhayr
c44fa8d470 Fixes #4534 
Conflicts:
	code/game/machinery/adv_med.dm
 2014-05-05 23:01:14 -04:00
Zuhayr
61cc809c87 Fixes #4495. 
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
 2014-05-05 22:50:38 -04:00
SamCroswell
666a953c6c Requested Map Changes 2014-05-05 19:57:16 -04:00
ZomgPonies
48aea00e33 Grav generator, not mapped in yet 2014-05-05 03:03:22 -04:00
Razharas
4b2deebec6 Making datum handling not suck balls too hard 
Yeah now it can roughly be called okish
 2014-05-04 22:56:38 -04:00
Razharas
8ee92a0f81 Removing debug shite 2014-05-04 22:56:01 -04:00
Razharas
95b6406adb Makes this shit actually work 
Yeah, also added crafting controller to debug controllers(who will need
to debug crafting, but whatever)

Conflicts:
	code/controllers/verbs.dm
 2014-05-04 22:55:42 -04:00
Razharas
3d762cd892 Readded the crafting to tables 
Well at least now i can brag about how you can do this with just few
lines

Conflicts:
	code/game/objects/structures/tables_racks.dm
 2014-05-04 22:54:08 -04:00
Razharas
281fbc7648 Made crafting entirely datum 
Now it can be useful
Maybe
Probably
I hope

Conflicts:
	code/_globalvars/lists/objects.dm
	code/game/atoms.dm
	code/game/objects/structures/tables_racks.dm
 2014-05-04 22:47:38 -04:00
ikarrus
0b6341746b Thermiting walls leave admin prints 2014-05-04 22:38:24 -04:00
ikarrus
ce6eff3173 Added a sound effect to igniting thermite so it's not a silent stealthy move. 2014-05-04 22:38:11 -04:00
ikarrus
9a66fd7edd Thermite Effectiveness Scaling with Volume 
-The more thermite is applied to a wall, the faster it will burn
-Scales between approx 10-25 seconds
-Rwalls have a higher minimum threshold and burn time
-Applying thermite to a wall now leaves a visible stain on the wall

Conflicts:
	code/game/turfs/simulated/walls.dm
	icons/effects/effects.dmi
 2014-05-04 22:37:44 -04:00
Ccomp5950
970525d065 Adds Mentors. 
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).

If the confic option for mentors is set then

	the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt

	staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.

Also:  Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.

Conflicts:
	code/controllers/configuration.dm
	code/game/verbs/who.dm
	code/modules/admin/admin_ranks.dm
	config-example/config.txt
 2014-05-04 21:37:37 -04:00
MrPerson
320a06f8c9 Make sure clones don't already have a body 
CASE: Guy gets backed up at genetics. Guy gets facehugged. Guy pops as a xeno. Guy gets cloned. Alium is left clientless.

Conflicts:
	code/game/machinery/cloning.dm
 2014-05-04 17:06:20 -04:00
ZomgPonies
fbb53d240c Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-04 16:32:18 -04:00
Jarcolr
e3b27e3ecd Cyborg hud modules now have proper icons 
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png

Conflicts:
	code/game/objects/items/robot/robot_items.dm
 2014-05-04 16:31:49 -04:00
ZomgPonies
679f0fe293 Merge pull request #194 from SamCroswell/master 
Nukeops Weapons Rework
 2014-05-04 15:43:03 -04:00
SamCroswell
740991092a Nukeops Weapons Rework 
Nukeops now start with a Stechtkin Pistol instead of the C-20r.
In addition, they now have more items available to purchase in their
uplink (Exclusive to Nukeops). They are as follows:
C-20r - 6TC
L6SAW - 10TC
C-20r Mag - 1TC
L6SAW Mag - 3TC
Stechtkin Silencer - 1TC
Advanced Medkit - 3TC

The prices are, of course, subject to change as we observe further
Nukeops rounds.
 2014-05-04 10:24:48 -04:00
SamCroswell
2d44352d0f Misc. changes 2014-05-04 09:37:28 -04:00
SamCroswell
521467fa3e C4 now explodes on detonation, Stechtkin pistol fix 
The Stechtkin pistol now works properly, C4 will now create a small
(Welder tank) sized explosion upon being detonated.
 2014-05-04 02:28:06 -04:00
ZomgPonies
d8aa63097b Made Vox trade shuttle dock at arrivals. 2014-05-04 00:29:14 -04:00
ESwordTheCat
3c3e4c7dc8 Heh forgot these. 2014-05-03 22:54:24 -04:00
ESwordTheCat
532298c725 Tweak object pool system. 
Conflicts:
	code/game/objects/structures/grille.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
 2014-05-03 22:54:09 -04:00
ZomgPonies
2b85081619 Merge pull request #193 from SamCroswell/master 
Ninja greentext fix
 2014-05-03 20:56:21 -04:00
SamCroswell
39670bf97a Ninja Greentext Fix 2014-05-03 20:52:07 -04:00
ZomgPonies
610b9b9962 Merge pull request #192 from SamCroswell/master 
Map changes, new ninja masks, more commits possibly to come
 2014-05-03 19:05:46 -04:00
SamCroswell
f4ef7c192b Map changes, new Ninja masks 
Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
 2014-05-03 18:35:10 -04:00
Zuhayr
e79097add3 Several IPC adjustments. 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2014-05-03 17:42:01 -04:00
Zuhayr
31e95baa78 Fixes for previous commit, sigh. 2014-05-03 17:38:01 -04:00
Zuhayr
75d8633fbe Adding some repair procs to cables and welders for IPC use. 
Conflicts:
	code/modules/power/cable.dm
 2014-05-03 17:37:46 -04:00
Zuhayr
7fe9b670f3 Fix for previous commit. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
 2014-05-03 17:35:55 -04:00
Zuhayr
9ec5a18e0b IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
 2014-05-03 17:34:43 -04:00
Cael Aislinn
18e3e37507 adds new feature: cloning extinct animals and seeds from fossils found through xenoarchaeology, some minor tweaks to various other areas to make it work 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	icons/obj/hydroponics.dmi
	icons/obj/xenoarchaeology.dmi
 2014-05-03 17:25:57 -04:00
SamCroswell
aa3dd4b368 Merge pull request #10 from ZomgPonies/master 
Update
 2014-05-03 16:35:15 -04:00
ZomgPonies
87ec4c3309 Compile fix 2014-05-03 14:57:21 -04:00
ZomgPonies
0804e21fde Fixes people getting karma jobs 2014-05-03 14:55:57 -04:00
ZomgPonies
765f3c5c41 Tune chargers to new battery levels. 2014-05-02 19:10:31 -04:00
thatprogrammerguy
ac100a8568 A more strict dynamic room selection code, and fixed an incorrect area definition for the dynamic lobby south of customs. 2014-05-02 17:27:57 -04:00
thatprogrammerguy
303fb1e476 Dynamic room balancing - added initial code for a more stricter selection process. 2014-05-02 14:22:39 -04:00
thatprogrammerguy
95dfb85675 Added dynamic areas, currently the only one sits under customs. 2014-05-02 02:52:08 -04:00
ZomgPonies
1d751e7a8f Moar rad damage from xray machine 2014-05-01 21:31:24 -04:00
ZomgPonies
40e0ff49ce fml xray 2014-05-01 21:01:10 -04:00
ZomgPonies
bc2af1573a Xray machine fixes 2014-05-01 18:14:56 -04:00