cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-17 00:57:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,779 Commits 17 Branches 2 Tags
11bf4a45a5ba9399f3c5deb978c93cdebb20dff7
Commit Graph
901 Commits
Author SHA1 Message Date
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
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
Tastyfish bba8104f38 Merge remote-tracking branch 'upstream/master' 2011-12-03 23:33:43 -05:00
Tastyfish 901d7c74af gave trashbags to janiborgs, beep/buzz emotes, removed abstract charge class from order list 2011-12-03 23:26:56 -05:00
baloh.matevz@gmail.com e05f78831e Added the r-glass recipe for the mining furnace. I actually thought it was there all along. rglass = sand + iron ore. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2603 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 03:28:30 +00:00
baloh.matevz@gmail.com f9badcefe1 It is no longer possible to make reinforced metal from metal sheets or vice versa. The reason for this is on Pete's side. The intention is to make RCD's not able to take down r-walls, however at the same time make r-walls harder to make. 
The way you make reinforced metal now is by using the mining processing unit. The recipe is a combination of metal and plasma ore.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2601 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 03:05:44 +00:00
headswe 1392f1100f Merge pull request #59 from Tastyfish/master 
made set-observe not make the mob pass out
 2011-12-03 15:11:07 -08:00
Tastyfish 772da9b506 made set-observe not make the mob pass out 2011-12-03 16:55:26 -05:00
petethegoat@gmail.com c6d94edb84 Fixed up some of the APC construction/deconstruction messages. 
Changed the popcorn sprite to one that doesn't suck, by Cheridan.
Updated dat changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2596 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-03 17:26:16 +00:00
Miniature 2159409d53 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/vote.dm

Because I did it derpily.
 2011-12-03 19:30:28 +10:30
Miniature f62eccc76b Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm
 2011-12-03 19:28:10 +10:30
Tastyfish 8c596e5c53 added sleeping on logout, willful sleeping, custom event message, slots 2011-12-02 17:28:24 -05:00
CompactNinja 79e8ad760b AI icon stuff from old code. Also fixed some of Mini's derping. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-12-02 21:18:29 +10:30
CompactNinja e2f4d44cbd Added old cyborg module sprites. Cyborgs can now select multiple styles, if there are multiple styles to select from. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-12-02 19:59:11 +10:30
ryantennessee@yahoo.com ac581158ca Moved 2 borg chargers from robotics to the maint hallways outside security and medical. Changed around borg module order to make it easier to pick things. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2590 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-02 08:00:16 +00:00
n3ophyt3 b8abae2eba Fixed the recharge rates on the captain's laser, energy crossbow, and advanced energy gun. 
pulse rifles can once again switch between stun, kill, and destroy (outside of the pulse destroyer, which has three settings, and they are all destroy)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2588 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-02 00:33:21 +00:00
LastBattaWolf@hotmail.com b00324f430 fix for issue 224 by quarxink desu 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2586 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-01 21:56:08 +00:00
petethegoat@gmail.com a80e46c078 Fixed issue 222. 
Improved closet/secure closet/crate code a bit. (Updated the paths on the map.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2585 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-01 20:02:43 +00:00
Tastyfish fc5097929e Fixed 3+ character slots bug 2011-11-30 23:34:23 -05:00
Tastyfish 0b28c04e8c Nanotrasen laws, nobody likes you asimov 2011-11-30 19:23:37 -05:00
Tastyfish b344e2a442 Merge remote-tracking branch 'upstream/master' 2011-11-30 18:35:58 -05:00
Tastyfish 26e1bfdaf1 Added vending charges, removed clown/mime from main joblist, sec belts fixed 2011-11-30 18:34:43 -05:00