cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,110 Commits 26 Branches 2 Tags
ced499edc374ef0caeba9e4e7e598e89da7b3523
Commit Graph

1294 Commits

Author SHA1 Message Date
Markolie
ced499edc3 Vox Heist port from Bay 2015-01-10 06:21:21 +01:00
Markolie
2757f98f71 Vox access fix 2015-01-08 03:44:15 +01:00
Markolie
2e37a88639 More verb fixes 2015-01-06 22:46:11 +01:00
Fox-McCloud
ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud
43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Markolie
3f77f3ba42 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	maps/cyberiad.dmm
 2014-12-23 02:50:14 +01:00
Markolie
0027425ab9 Consistency in ERT equipment, give ERT PDA's so they can be messaged privately 2014-12-23 02:36:40 +01:00
Fox-McCloud
4868d3795d Vox and Space 2014-12-09 03:47:46 -05:00
Markolie
6c92a48c41 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-06 01:31:31 +01:00
Markolie
aa68b2e160 AI/Cyborg HUD fixes, lets Vox's pick name when spawning, fixes Beepsky's/ED-209's ID'ing issue 2014-12-06 01:26:59 +01:00
Fox-McCloud
fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
SamCroswell
32661552e9 You cannot use the force, Luke! 2014-12-03 21:48:42 -05:00
SamCroswell
021bc233be Dualsword Inhand Fix, Adds Dark Lord Costume Preset 2014-12-03 21:47:12 -05:00
Markolie
cb7676c139 Re-add stamp images, add more holopads 2014-12-03 02:53:26 +01:00
Fox-McCloud
72b43c3c1e Merge pull request #8 from SamCroswell/master 
Dress Up Fix
 2014-11-30 00:23:18 -05:00
SamCroswell
580dd00c1d Dress Up Fix 2014-11-29 23:22:59 -05:00
Markolie
bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
Markolie
3b1dc8e487 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 
Conflicts:
	icons/obj/weapons.dmi
	maps/cyberiad.dmm
 2014-11-27 21:39:01 +01:00
Markolie
b66f3effae Bug fixes, implements new copying/faxing system from Bay 2014-11-27 21:00:58 +01:00
Tigercat2000
067d9565e3 Changes the button for admin OOC color to be descriptive of such. "OOC 
Text Color" to "Personal OOC Text Color"
 2014-11-20 20:13:31 -08:00
ZomgPonies
5b04ef3385 Merge pull request #355 from Bone-White/master 
Pipe wall drilling fix
 2014-08-05 20:34:01 -04:00
Bone White
26acad361e Added Admin PM by Key verb 2014-08-05 16:38:37 +01:00
ZomgPonies
a3fdd71012 Forgot an event verb for seniormins 2014-08-03 22:08:41 -04:00
Walter0o
23bc5b822c fixes runtime with calling PP on dna-less mobs 
Conflicts:
	code/modules/admin/admin.dm
 2014-08-03 15:26:36 -04:00
SamCroswell
ace4d63a8f Minor change, testing some GH commands. 2014-07-27 08:47:29 -04:00
ZomgPonies
48be906056 Merge pull request #328 from SamCroswell/master 
Added an admin verb to toggle ERTs
 2014-07-26 19:15:57 -04:00
SamCroswell
075ad2a943 Added an admin verb to toggle ERTs 2014-07-26 18:04:33 -04:00
IcyV
acbaa31194 Enables the "cult" investigation 
Exactly as the name says. Makes use of all the investigate_log in place for cult
 2014-07-25 11:57:13 -07:00
ZomgPonies
dc56dc8958 Investigate PDA messages 2014-07-25 12:32:35 -04:00
ZomgPonies
b33df4745c Removed deprecated power generation stuff (AM, RUST) to free up more procs 2014-07-25 11:33:37 -04:00
ZomgPonies
431ab486b3 Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row) 2014-07-23 11:04:07 -04:00
ZomgPonies
800d5b4b0b Revert "Made wizard spells into various subtypes" 
This reverts commit 8b703f55af.
 2014-07-23 10:58:20 -04:00
d3athrow
e93220cfd0 alert windows that close themselves after enough time. 2014-07-23 08:49:42 -04:00
Mark Aherne
992ceecd4e NanoUI updates. 
* Map gen verb is now limited to those with server access.
* Added Z layer support.

Conflicts:
	code/modules/admin/admin_verbs.dm
	nano/images/nanomap.png
 2014-07-21 18:54:19 -04:00
ZomgPonies
8b703f55af Made wizard spells into various subtypes 2014-07-21 09:40:42 -04:00
Zuhayr
7c07240ac9 Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites. 
Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/alien.dm
	code/modules/projectiles/guns/projectile/crossbow.dm
	code/modules/projectiles/guns/projectile/pneumatic.dm
	icons/mob/back.dmi
	maps/tgstation2.dmm
 2014-07-21 06:10:45 -04:00
ZomgPonies
4e1d24609f Fireball explosion fixes 2014-07-20 04:31:32 -04:00
ZomgPonies
5d58322b0a Merge pull request #305 from SamCroswell/master 
Added new eye-replacement glasses
 2014-07-19 10:40:40 -04:00
SamCroswell
72f4607fad Added new eye-replacement glasses 
These aren't intended for everyday use, I plan to incorporate them into
future events.
 2014-07-19 02:17:20 -04:00
ZomgPonies
60b0659d43 Made update_power be at mob level since spells are at that level. 2014-07-18 12:11:13 -04:00
d3athrow
994a5bebbf Fix admins having to toggle genes several fucking times to get them to turn on sometimes. 
Fix adminbus toggling genes on to cause all other genes to manifest - added genemutcheck proc and domutation proc to handle the changes.
Added a global list of gene datums that match the order of the randomized blocks in genetics to allow for easy lookup based on blocks and allows single gene checking to work.

Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/admin/verbs/debug.dm
 2014-07-17 05:27:05 -04:00
ZomgPonies
aafa11712a Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed! 2014-07-16 00:53:08 -04:00
ZomgPonies
88098da3c7 Object verb removal crew 2014-07-15 08:47:43 -04:00
Kelenius
c54b9e3626 Slime update 
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/say.dm
	code/modules/mob/transform_procs.dm
	code/modules/reagents/Chemistry-Recipes.dm
	maps/tgstation2.dmm
 2014-07-15 00:50:41 -04:00
Zuhayr
333c3c8ae7 Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs. 
Conflicts:
	baystation12.dme
	code/modules/admin/admin_verbs.dm
	maps/tgstation2.dmm
 2014-07-13 08:44:47 -04:00
ZomgPonies
76276ace29 Cleaning out old unused code. 2014-07-13 08:10:44 -04:00
mwerezak
40c6508ccb long_jump() now uses an arrive_time var instead of sleeping the whole time. 
Makes ETAs more accurate, allows the possibility of interrupting
long_jumps in the future.

Conflicts:
	code/modules/shuttles/shuttle.dm
 2014-07-13 06:05:29 -04:00
ZomgPonies
92940e1c00 Running tests and cleaning out useless debug verbs/procs. 2014-07-13 05:32:40 -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