cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 17:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,634 Commits 26 Branches 2 Tags
91e4498792fb8728e2d8edafdbd2a07da4744c56
Commit Graph

14272 Commits

Author SHA1 Message Date
Tigercat2000
91e4498792 Revert "Allow's slime people to make a squishing sound with *squish" 
This reverts commit 2d67449c6f.
 2014-11-30 16:20:14 -08:00
Tigercat2000
48cfaa7f54 Revert "Changed a couple lines to be more serious." 
This reverts commit dd25c9e4a3.
 2014-11-30 16:19:57 -08:00
Tigercat2000
f91c1400b6 Revert "Makes the gibber Ultra-Dramatic." 
This reverts commit 0e99339d52.

Conflicts:
	code/game/machinery/kitchen/gibber.dm
 2014-11-30 16:19:14 -08:00
Tigercat2000
d70ca5acb2 Fix's the handcuffing logs to be Officer > Cuff-ee instead of Cuff-ee > 
Officer
 2014-11-30 12:54:09 -08:00
Tigercat2000
2d67449c6f Allow's slime people to make a squishing sound with *squish 2014-11-30 12:22:59 -08:00
Tigercat2000
dd25c9e4a3 Changed a couple lines to be more serious. 2014-11-29 22:50:22 -08:00
Tigercat2000
0e99339d52 Makes the gibber Ultra-Dramatic. Can be toggled on and off via the 
'dramatic' variable.
 2014-11-29 20:50:31 -08:00
Fox-McCloud
bfa1536e74 Merge pull request #6 from Markolie/master 
Fix basic energy gun runtime
 2014-11-29 21:20:41 -05:00
Markolie
ced6357e9b Fix basic energy gun runtime 2014-11-30 02:36:35 +01:00
Tigercat2000
34d4bb0da4 Whoops, Left in some unfinished code, removed 2014-11-29 17:18:00 -08:00
Tigercat2000
28bff4161e Makes unable to scan message red instead of blue 2014-11-29 16:57:12 -08:00
Tigercat2000
7512adf2f5 Fixes a potentially abusable bug involving the chameleon projector and 
playing cards.
 2014-11-29 16:54:49 -08:00
Markolie
3de68526d4 Add autopsy data for stunning and bullets 2014-11-29 23:10:00 +01:00
Markolie
39eada12ba Move service channel to :z 2014-11-29 22:07:50 +01:00
Markolie
af9aeaaf84 Autotraitor fixes 2014-11-29 21:59:57 +01:00
Markolie
bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
Markolie
412e087d7e NTSL addition for service 2014-11-29 21:01:20 +01:00
Markolie
0dc52900cc Adds the service channel (:v) 2014-11-29 21:01:19 +01:00
Fox-McCloud
f85def5f09 Hug Nerf 2014-11-29 10:09:57 -05:00
Fox-McCloud
3b884622c5 Job Changes 2014-11-29 09:10:31 -05:00
Markolie
35fa4600e7 Merge branch 'master' of https://github.com/Markolie/Paradise 2014-11-29 02:39:45 +01:00
Markolie
dbe0cbfad8 consistency 2014-11-29 02:10:32 +01:00
Markolie
e143279ce0 Correction 2014-11-29 02:09:22 +01:00
Markolie
ae8f08e2b8 Fixes reflection, various security level fixes, gamma armory update, communication console fixes 2014-11-29 02:05:42 +01:00
Fox-McCloud
0128878100 Merge pull request #535 from Fox-McCloud/Species-Guns 
Species guns
 2014-11-28 19:24:55 -05:00
Fox-McCloud
053d79b04c Merge pull request #494 from LazureusFalcone/patch-1 
Update lib_machines.dm
 2014-11-28 19:24:28 -05:00
Fox-McCloud
a4c72d4603 Species and Guns 2014-11-28 19:13:41 -05:00
Markolie
7e544c17bc Fix DNA Injectors with abilities, adds mob's name to autopsy data 2014-11-28 21:14:00 +01:00
Markolie
df5d569bb1 Minor borg fix 2014-11-28 01:40:58 +01:00
Markolie
f62cb59ad7 Default stunbaton back to 1500 2014-11-28 01:37:05 +01:00
Markolie
a34d283aab Cloning and deathsquad fixes 2014-11-28 01:33:36 +01:00
Markolie
87fb604761 Fix Supermatter message spam 2014-11-27 23:05:31 +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
e6cf333e4e Lets not forget debugging again 2014-11-27 21:33:26 +01:00
Markolie
da0f915246 Fix cyborg zippo's 2014-11-27 21:19:18 +01:00
Markolie
b66f3effae Bug fixes, implements new copying/faxing system from Bay 2014-11-27 21:00:58 +01:00
Fox-McCloud
c9b6d7197a Merge pull request #532 from SamCroswell/master 
Deathsquad Cyborgs
 2014-11-27 10:43:47 -05:00
SamCroswell
672cf362e0 CentComm Borg Access Fix 
Now requires specops access. I'm a goof.
 2014-11-27 09:58:42 -05:00
SamCroswell
5d6abde5ed Deathsquad Cyborgs 
Adds Deathsquad cyborgs. The only reason these really exist is because I
was bored, but hey! They come equipped with the latest in adminboos
gear, including a fully functional pulse rifle and esword, and a cell
that has 50,000 energy! What could go wrong?
 2014-11-27 01:38:52 -05:00
Fox-McCloud
2700681b0c Merge pull request #531 from SamCroswell/master 
Projectile Laser Update
 2014-11-27 01:13:18 -05:00
Fox-McCloud
194711fef6 Merge pull request #530 from Markolie/master 
The Mortician's labcoat can now be (un)buttoned
 2014-11-26 20:58:35 -05:00
SamCroswell
8b16d394ed Projectile Laser Update 
Lasers are now projectiles instead of instant beams. Fire delay removed,
damages adjusted accordingly.
 2014-11-26 19:16:21 -05:00
Markolie
6cfea53224 The Mortician's labcoat can now be (un)buttoned 2014-11-26 23:43:50 +01:00
Fox-McCloud
f7c0acb0e2 Merge pull request #529 from Markolie/master 
Makes NT Representative/Recruiter Karma locked again, SyndiBorg modtype fix
 2014-11-26 17:32:42 -05:00
Markolie
7dd1420f68 Makes NT Representative/Recruiter Karma locked again, SyndiBorg modtype fix. 2014-11-26 23:23:49 +01:00
Tigercat2000
bfcbb5fc17 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-11-26 13:28:52 -08:00
Tigercat2000
7e02544db4 Removes debugging broadcast from force-say. 2014-11-26 13:27:50 -08:00
Fox-McCloud
7e9f669f44 Merge pull request #527 from Markolie/master 
Adds Mortician, vomit mask fix, fix for missing images for various jobs
 2014-11-26 15:14:52 -05:00
Markolie
7554748a26 Adds Mortician, vomit mask fix, fix for missing images for various jobs 2014-11-26 20:44:06 +01:00
Fox-McCloud
261157cb58 AI, PDA, and Other changes 2014-11-26 01:18:49 -05:00