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

7515 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
5e4273c919 Fixed runtime in secure briefcase code. 2012-10-21 17:58:54 +04:00
Chinsky
7ae59ba6f7 Slapped a few nullchecks near reported runtimes. 2012-10-21 16:41:44 +04:00
Chinsky
52f9c0c9dc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-21 05:52:18 +04:00
Chinsky
77d12b5e19 Added photos to security and medical records terminals. 
Generated during record creation, smaller version of char setup preview code.
 2012-10-21 05:45:36 +04:00
Chinsky
179c510547 Makes briefcase start without paper. 
All jobs that start with it have plenty of places to get paper.
 2012-10-20 22:50:01 +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
fbf3396e4c map compile fixes, added a surprise to the teleporter 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 02:51:30 +10:00
Cael_Aislinn
0f3f008ff6 mergefixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 02:22:06 +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
aranclanos@hotmail.com
7bbf30c800 Fixes issue 1007. Changed the throwforce of the holodeck energy swords from 5(!) to 0. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4921 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-20 14:39:11 +00: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
headswe
4a7c435748 Merge pull request #1802 from comma/master 
Runtime
 2012-10-20 06:21:50 -07: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
66a250ec58 -Fixed Issue 1021 - Rather simple solution but it's a shame I have to do it this way. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4918 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-20 03:46:11 +00:00
aranclanos@hotmail.com
e4bcc80405 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4917 316c924e-a436-60f5-8080-3fe189b3f50e 2012-10-20 02:51:12 +00:00
giacomand@gmail.com
ba32520ca2 -Forgot to remove a debug message. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4916 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-20 02:23:26 +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
926036a660 Fixed a few more problems with RP revolution and anti revolution. 
Heads now get the chance to resign.
RP rev convert verb now is in the IC tab
 2012-10-19 11:28:52 -07:00
cib
c4d4f1950e Fixed an error in the anti-revolution objective description. 2012-10-19 11:08:07 -07:00
cib
4046b80829 Corrupt heads should now be displayed in antagonist panel. 2012-10-19 10:59:01 -07:00
cib
0849907dae Fixed another bug with anti-revolution. 2012-10-19 10:35:54 -07:00
cib
ce76e802f1 Fixed a small bug with anti-revolution. 2012-10-19 10:33:54 -07:00
cib
bf3e910a12 Merge branch 'master' of github.com:CIB/Baystation12 2012-10-19 10:17:02 -07:00
cib
bf83e5c3ba Added a new mode: anti-revolution 2012-10-19 10:00:54 -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
cib
172c974111 Changed the announcement for RP revolution. 2012-10-19 08:59:33 -07:00
cib
180a6267ef Small bugfix for rp revolution. 
Lategame assigned head revolutionaries would still be regular revolutionaries.
 2012-10-19 13:57:34 +02:00
cib
59fcb2cd17 Removed HONK from the possible random diseases. 2012-10-19 13:52:24 +02:00
cib
3c912718e9 Fixes retrovirus bug where it wasn't curable. 2012-10-19 13:50:49 +02:00
Chinsky
5513280add Fixed runtime in C4 code 2012-10-19 14:31:54 +04:00
Mloc
740c6dc70f Merge pull request #1796 from CIB/master 
RP Rev Fix
 2012-10-18 13:55:52 -07:00
cib
89a8744630 Fixed an issue with the automated rev addition. 2012-10-18 22:23:49 +02:00
cib
28d6e81ea3 Fixed a bug with the rp-rev convert verb. 2012-10-18 21:16:06 +02: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
Chinsky
7f9132e23a Fixes a runtime. 2012-10-18 20:58:35 +04: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
b0aee942a7 You can now exame an IV drip to get the loaded chemicals and attached person. 2012-10-18 16:08:43 +02:00
cib
01ba3871ca Fixed the bug where 'Show Own Skills' wouldn't work. 2012-10-18 15:33:46 +02:00
cib
e103cc799e Fixes a runtime. 2012-10-18 15:22:54 +02:00