cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,794 Commits 9 Branches 0 Tags
ecb74a32d2b96fb6fb1eca9db3635aecc1e2aab5
Commit Graph

4077 Commits

Author SHA1 Message Date
Cael_Aislinn
ecb74a32d2 fix for admins not being applied properly 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 19:57:50 +10:00
Cael_Aislinn
9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 19:35:03 +10:00
Chinsky
52f9c0c9dc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-21 05:52:18 +04:00
Chinsky
085f5f7fe1 Added ability to rig fueltanks 
To make your very own ghetto explosive:
1.Wrench faucet open on tank.
2.Add assembly of your choice (only timers and radios work as triggers here)
To unmake it simply remove assembly with hands and wrench faucet back.

Rigging tank with igniter logs for admins.

Also explosion size depends on amount of fuel left in tank.
 2012-10-20 22:31:13 +04:00
Chinsky
21a19d46cb Fixed typo, now slur should properly fade away. 2012-10-20 22:05:57 +04:00
Cael_Aislinn
9f67811427 Merge remote-tracking branch 'remotes/git-svn' 4921 into bs12_with_tgport 
Conflicts:
	code/game/machinery/computer/HolodeckControl.dm
	code/modules/mob/living/simple_animal/life.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 02:59:35 +10:00
Cael_Aislinn
01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 01:25:04 +10:00
Cael_Aislinn
2a07ba0f6e mergefixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 01:04:37 +10:00
Cael_Aislinn
2f853fe23a Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 00:25:05 +10:00
aranclanos@hotmail.com
98cfaff0b8 Holodeck weapons no longer harm simple animals. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4920 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-20 14:16:24 +00:00
Cael_Aislinn
3fe88c4fef mergefixes, misc 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 00:11:01 +10:00
aranclanos@hotmail.com
6ff45ca10f Fixes issue 1005. Bears, Carps, Clown NPCs and syndicate NPCs will now attack mechs. Only if the mech has a driver. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4919 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-20 13:12:54 +00:00
giacomand@gmail.com
28fbd01e7f -Added a new, and admin spawnable only, machine which can turn humans into Cyborgs. Probably can be used for Robot Uprising events. The human has to be lying down and alive to be Borged. When spawned a conveyor belt will spawn on the left and right side too. 
-Reduced the duration of the flare. I think putting it in process() made it last longer.

-Added some null checks in camera chunks.

-Large NarSie now force calls the shuttle and displays a threatening warning message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4915 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-20 02:13:40 +00:00
giacomand@gmail.com
1e1f173ca2 -Added large Nar-Sie. It is summoned by Cultists instead of regular Nar-Sie. 
-Larger icon provided by HornyGranny.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4914 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-19 20:38:53 +00:00
cib
4046b80829 Corrupt heads should now be displayed in antagonist panel. 2012-10-19 10:59:01 -07:00
giacomand@gmail.com
092bb7b056 -Sanitized brain messages which they talk through their radio enabled MMI. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4912 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-19 16:38:11 +00:00
Chinsky
f6bcb421d4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-18 21:35:13 +04:00
Chinsky
5f7c9d5518 Readded welder fuel. 
Fixed issue with fire not generating light.
Fixed pre-merge issue with fuel passing through closed airlocks.
 2012-10-18 21:25:24 +04:00
Mloc
af8ab15ebf Merge pull request #1795 from CIB/master 
Various fixes
 2012-10-18 10:18:03 -07:00
giacomand@gmail.com
2f68d2cd48 -Brain radio MMIs were fixed, they wouldn't broadcast the MMI's message. 
-Fixed a bug where you couldn't talk into intercoms while it is dark.
-AIs can now type in the "track with camera" verb and get a list of names to show up. This can save time if the AI needs to track an individual.
-Deleted the old AI move.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4910 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-18 16:16:29 +00:00
cib
ed6994d17c Removed the silly adminhelp delay. 2012-10-18 16:33:14 +02:00
cib
01ba3871ca Fixed the bug where 'Show Own Skills' wouldn't work. 2012-10-18 15:33:46 +02:00
Chinsky
274ac1d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-18 15:42:11 +04:00
Chinsky
16e6f178a4 Buffed fuel tank explosions. 2012-10-18 15:40:55 +04:00
cib
d90944ad50 Several medical related changes. 
- There's now internal wounds
- Appendicitis stage 4 causes internal wounds
- Added back the body scanner
 2012-10-18 12:39:04 +02:00
Chinsky
c8b7227329 Mixup in forensics jacket path 2012-10-18 10:09:14 +04:00
Chinsky
92276c9887 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/new_player/new_player.dm
	html/changelog.html
 2012-10-18 09:13:24 +04:00
Kortgstation@gmail.com
326c57fa04 Fix for the chef corpse spawning half naked. 
Fixed Nodrak's empty c20r spawning so it only happens to the guns on his map.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4907 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-18 03:45:00 +00:00
Asanadas
0ba466e881 Removing Soghun stutters, fix for infinite BoH in BoH. 2012-10-17 19:18:17 -04:00
headswe
fde9562bb5 Merge pull request #1789 from CIB/master 
Limb selection
 2012-10-17 11:28:48 -07:00
cib
a1aa3ddecf Ported limb selection. 2012-10-17 20:08:34 +02:00
headswe
58a63cd61f Merge pull request #1788 from headswe/master 
Whoops forgot a thing also reenabled a warning message but with a add…
 2012-10-17 10:02:31 -07:00
Head
59964d4025 Whoops forgot a thing also reenabled a warning message but with a added check 2012-10-17 19:00:20 +02:00
cib
463178213c You can now pick opposite gender hairstyles. 2012-10-17 18:53:00 +02:00
Mloc
a5366e8647 Merge pull request #1787 from headswe/master 
Fixed iv drips hopefully
 2012-10-17 09:31:41 -07:00
Head
ea714643b6 Hopefull fixed iv drip bug. 2012-10-17 18:27:44 +02:00
Mloc
351a233f5f Arrivals runtime fix, thanks to Head! 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-10-17 16:07:19 +01:00
aranclanos@hotmail.com
d25a5d5aa3 Fixes issue 1001. 
Fixes issue 994. (Chemsprayers are not included)
Fixes issue 990.
Adding some instant admin logs and server logs for some stuff in emitters/PA. See image. http://i.imgur.com/7kQpH.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4904 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-17 14:27:23 +00:00
aranclanos@hotmail.com
ce94195578 Nerfed admin observers to the ground. Instead of listing what they can't do, I'l just list what they can do. 
-Acces to asay chat, chatting included (asay comes with adminlogs alerts)
-Toggle adminhelp sound
-Deadmin themselves
-Answering adminhelps (They shouldn't be doing this acting like real admins)
-They can see prayers

Everything else is gone, VV, PP, subtle message, etc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4903 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-17 13:17:34 +00:00
Chinsky
44934ef622 Removed my highly informative and professional debug print. 2012-10-17 14:33:53 +04:00
Chinsky
45e40c09c0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-17 14:12:41 +04:00
elly1989@rocketmail.com
b72c663146 TopicData is stripped from connecting clients. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4901 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-17 10:11:25 +00:00
Chinsky
357f42028e Forgot one hairstyle. 2012-10-17 13:50:47 +04:00
aranclanos@hotmail.com
d21fb3c87c Quick fix for trialmins being able to right click -> VV 
Removing VV from observers. (More nerfs incomings)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4899 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-17 09:36:42 +00:00
giacomand@gmail.com
3b95730028 -Committed RavingManiac (Smoke Carter)'s Roros laying eggs. 
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10501
-You can insert the Auth Disk by clicking on the nuclear bomb.
-Changed how aliens are selected. It will filter the list of possible candidates by checking for players who aren't inactive for more than a minute. If no possible candidates are found, it increases the filter by another minute. It does this 5 times before giving up.
-Alien embryos cannot have carriers and they are more likely to infect someone.
-The time it takes before a larva bursts is increased a bit.




git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4897 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-17 06:04:25 +00:00
johnsonmt88@gmail.com
05f2c58d9b Admin observers: 
- No longer see antagonists via /who command.
- Now have the 'toggle adminhelp sound' verb.

Removed a bunch of the 'deadmin_self' verb from various admins and gave it to admin observers. All admins should have it now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4895 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-17 01:13:26 +00:00
Chinsky
f0c4e3e965 Ported some of hairstyles. 2012-10-17 04:50:49 +04:00
Chinsky
da147b083c Added Forensics Technician jackets to Detective wardrobe. 2012-10-17 03:28:59 +04:00
Chinsky
0c97d77d77 Fixes issue with slurring never going away. 
Ethylredoxrazine now properly fights alcohol effects.
 2012-10-17 03:28:10 +04:00
Chinsky
fbc26fde61 Fixed Arrivals runtime. Does not fix issue of it not announcing arrival though. 2012-10-17 03:24:39 +04:00