cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 18:47:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,362 Commits 17 Branches 2 Tags
12675d12d28fa5aa57ff0b1cbd2dfec8ff0ce553
Commit Graph
1121 Commits
Author SHA1 Message Date
cib 4d00ed6890 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/defines/mob/mob.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/humanoid/queen.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	maps/tgstation.2.0.8.dmm
 2011-12-10 01:11:00 -08:00
Albert Iordache 0a4ae48ca7 Fixed compile error. 2011-12-11 01:35:57 +02:00
Albert Iordache 073d160e38 Merge branch 'master' of https://github.com/SHFFLE/Baystation12 into shffle-master 
Conflicts, manually merged:
	icons/mob/suit.dmi
	maps/tgstation.2.0.8.dmm
 2011-12-11 01:24:42 +02:00
CIB 985112f052 Merge pull request #92 from Abi79/master 
Slurring from Alcohol, btw. Aryn wrote the slur proc
 2011-12-10 12:54:45 -08:00
Albert Iordache 9d774ed3c9 Coffee and black tea now gets rid of the slurriness from alcohol. Also added Cib's slur proc. 2011-12-10 22:33:18 +02:00
SHFFLE 412759a35b Added Security RIG 2011-12-10 12:48:28 -06:00
cibandAlbert Iordache 9dbe06b22b Added a notes panel that lists all players that have notes on them. 2011-12-11 02:48:02 +08:00
Albert Iordache 2d4e356d8c Merge pull request #86 from CIB/master 
Made some improvements to the player info panel
 2011-12-10 06:22:22 -08:00
Albert Iordache e72ae5e8f6 Added a new slurring variable, and set it up in the right places 2011-12-10 14:25:49 +02:00
Albert Iordache c68a22f497 Merge branch 'SkyMarshal-764432e' 2011-12-10 12:35:15 +02:00
Albert Iordache 5d2dfbcff7 Thermals now look like regular sunglasses. Added some special engineering emergency oxygen tanks to engineering. 2011-12-10 12:29:02 +02:00
Albert Iordache 64106be003 Merge pull request #82 from SkyMarshal/3319b22adf33c757fc42aa515bc05db894fd0e90 
Lot of tweaks and fixes, read the description.
 2011-12-10 01:43:34 -08:00
cib 5a3320f30f Added a notes panel that lists all players that have notes on them. 2011-12-09 17:45:13 -08:00
cib d970d2b4f9 Added a drunk variable and a text filter specifically for drunk talking, originally coded by Aryn. 2011-12-09 16:44:13 -08:00
cib 3a27c74b46 Some small improvements to the player info panel. 2011-12-09 15:12:01 -08:00
SkyMarshal 764432e4e8 Fixed minor errors. 2011-12-08 22:13:51 -07:00
SkyMarshal 61d21b3cab Added the ability for borgs to ude departmental radios 2011-12-08 22:02:46 -07:00
cib 11bf4a45a5 Added a "player info" option to the player panel that will allow you to make notes on a specific player etc. 2011-12-08 20:43:20 -08:00
Albert Iordache ae34949324 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-09 18:58:32 +02:00
Albert Iordache 3efa552eda Merge branch 'master' of https://github.com/Miniature/Baystation12 into Miniature-master 
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
 2011-12-09 14:56:32 +02:00
Tastyfish afd1aca53b let everyone do me emotes properly! (bots,monkeys,...) 2011-12-09 02:24:33 -05:00
unknown 8f11c4acfb DO NOT USE. 2011-12-08 17:07:25 -07:00
SkyMarshal 009d0915bf Removed most other cyanide references. Remade cyanide pills into suicide pills (100 units of Toxin) 2011-12-08 14:22:45 -07:00
SkyMarshal d7eb6e4ae6 Remove Cyanide, add Sleepy Pen and Thermals to uplink, remove cloaker 2011-12-08 12:35:10 -07:00
Albert Iordache dd6ddaa8c3 Revert "removed cloaker" 
This reverts commit 1fa97843f8.
 2011-12-08 15:28:35 +02:00
Albert Iordache 00e8e13d1e Merge pull request #76 from Tastyfish/master 
The closet tg merge broke charge crates
 2011-12-08 05:27:20 -08:00
Uristqwerty 74c2b7c55b Stealth PM fix: hide stealthmin names in the input box title. 2011-12-07 12:50:05 -05:00
Tastyfish 1fa97843f8 removed cloaker 2011-12-07 12:29:04 -05:00
Miniature af301633f6 Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
 2011-12-07 07:53:20 +10:30
Miniature 5fec6c6319 DM why you so shit 2011-12-07 07:46:08 +10:30
Albert Iordache 9dc2644e51 Commented out more of the fat code, for issue #71. 2011-12-06 19:23:25 +02:00
Albert Iordache 6a62c3b8ff Merge pull request #71 from SkyMarshal/master 
Removed obesity upon overeating
 2011-12-06 08:48:06 -08:00
uporotiy df04d75c48 Aaaaaaaaaand once again I forget to upload a new file. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2629 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 15:04:11 +00:00
SkyMarshal 68b1be773a Removed fatness from overeatting 2011-12-06 02:47:50 -07:00
uporotiy 4764cdc990 Aliens: 
Reworked the code to use a new "plasma" var instead of toxloss for their powers.
Facehuggers are now active for 30 to 60 instead of 3 to 5 seconds.
Aliens can see whether facehuggers are active without needing to examine them.
Changelings:
Ranged sting is now 2 squares-ranged instead of 3 squares.
Space:
Reverted the randomly accessible z-levels back to how they were (derelict and ai sat).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2627 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 08:30:03 +00:00
Tastyfish 139252dbda made me accept v/h in form of "me v waves."/"me h shouts!", fixed v/h types of robot emotes, added *help for robots 2011-12-06 00:30:07 -05:00
kortgstation@gmail.com 07dac128c1 Gyrojet bolts now explode on contact with mobs and walls. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2626 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 04:50:42 +00:00
Tastyfish 571ee5f3de fixed Load Slot Close button 2011-12-05 14:33:18 -05:00
CompactNinja dc3ada7c27 Merge pull request #66 from Miniature/master 
AI freelook stuff - should work perfectly now
 2011-12-04 21:45:13 -08:00
Miniature a7b2110194 AI freelook stuff - should work perfectly now 
Urist said that /tg/ people got some runtime errors, I have no idea what they got and I haven't got any errors in testing so yeah.
 2011-12-05 15:08:52 +10:30
headswe ec2456a1f0 Merge pull request #60 from Tastyfish/master 
borgs go beep and janitor borgs can OCD, charge ordering bug fix, flavor text
 2011-12-04 15:31:07 -08:00
uhangi@gmail.com 44c0cfc46d -Adding pepper spray for security officers. 
-Fixed a storage bug for chemsprayers and space cleaner

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2618 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 22:42:18 +00:00
n3ophyt3 e4afa60af2 Accidentally removed a line when I was fixing gun recharge rates. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2616 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 21:40:31 +00:00
baloh.matevz 962919f6e0 - Added the ability to communications computers to switch between the blue and green security levels. I wanna make a super special way to get to the red level, which involves the turning of multiple keys (id cards) in multiple areas :) 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2615 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 20:32:30 +00:00
Tastyfish c208332942 added Anchorshag's examination flavor text thingy 2011-12-04 15:26:46 -05:00
Miniature 5b15848a07 Made pAIs tell candidates who is requesting. 2011-12-05 04:13:17 +10:30
Miniature a3e7e394ad Switched charge amounts for automatically turning off machinery and lights, so lights turn off before machinery (like on old code). 2011-12-04 22:52:20 +10:30
baloh.matevz 793d4051e2 security levels commit oddities fixed. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2611 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 10:25:03 +00:00
uhangi@gmail.com 02132f4ebf Added grenade launcher, one in the armory with the rest of the riot gear. Capable of holding three grenades at a time. Also, one box of flashbangs in Security, another in the firing range, and two extra pairs of glasses (not HUDglasses) in the firing range. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2609 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 09:47:19 +00:00
baloh.matevz@gmail.com 9375c09666 security levels commit 1 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2606 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 06:49:59 +00:00