cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,995 Commits 8 Branches 0 Tags
a24b637de561c876eea97cb15cc77d9c75dbbe25
Commit Graph

4186 Commits

Author SHA1 Message Date
DarkTechnomancer
4bf6833a62 Fixed flavor text 2012-10-13 19:27:43 -04:00
headswe
c04c26fa29 Merge pull request #1759 from headswe/master 
Fixed Organspam (Maybe)
 2012-10-13 15:44:42 -07:00
Head
085d357b4b Hopefully fixed organ spam. 2012-10-14 00:43:23 +02:00
baloh.matevz
a5b37f81c3 - Added a config option that allows the admin system to run off of data from the database. There is a config options in config.txt that dictates whether to use the new SQL based system or the legacy admins.txt system. If a server is set to use the new system, but a connection cannot be established to the database, it reverts to the legacy system, same applies if a query to the database returns empty. The config option defaults to use the legacy system. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4863 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 22:32:51 +00:00
Chinsky
c3b53af100 Commiting for the night, in case KGB steals my laptop. 
Pretty much finished surgery system.
-working appendectomy, bone surgery, eye surgery, face surgery, brain surgery (humans only) and metroid core surgery.

-moved operation stages tracking vars to one op_stage datum. Left brain opstage var alone because way too many things reference it.

-added bone gel and bone setter.

-added check for surgery tools, so new doctors won't beat shit out of patients on optable too often.

-pretty much emptied surgery_tols.dm, it was unneeded by this point.

Still need to test it more, slap sanity checks everyfuckingwhere.
Also more literate messages written with help of trained monkey (faux).
 2012-10-14 02:15:23 +04:00
giacomand@gmail.com
940808ee86 -New facehugger animation by Sly. 
-Moved "debug_controller" to badmin, so if the controller needs debugging a game admin can promote a coder to badmin and allow them to debug it.
-Fixed an issue with aliens having two different status tabs.
-Moved all facehugger icons to icons/mob/alien.dmi

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4862 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 21:26:30 +00:00
baloh.matevz
3def1bd57a - Added corgi puppies to code: 
Screenshot:
http://www.kamletos.si/puppy.PNG

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4860 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 20:31:35 +00:00
petethegoat@gmail.com
7d0dc98613 it keeps happening 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4859 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 19:54:56 +00:00
giacomand@gmail.com
3dd4f8cbc5 -Optimized freelooking a bit. 
-Larva can now die, instead of staying in critical.
-Improved the prison break event.
-Added the cameranet to the list of debuggable controllers (I know it's not technically a controller but it seems like the best place to be).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4858 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 19:52:41 +00:00
petethegoat@gmail.com
c4382905e5 Stamps are applied based on the icon_state of the stamp. Saves a switch. 
They are also offset by a random amount.

Sosjerky is now properly named.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4857 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 18:55:09 +00:00
cib
415e1c47d9 Made nudge.py script location configurable. 2012-10-13 11:11:57 -07:00
cib
c747e5e56e Chloral hydrate and sleep toxin now have a small delay before taking effect. 2012-10-13 10:51:08 -07:00
cib
160328741e Made the human/drip() proc produce larger pools. 2012-10-13 10:08:12 -07:00
cib
31093ce666 More messages for low blood. 2012-10-13 09:59:17 -07:00
cib
e77afd5ab9 Added bleeding and blood transfusion. 2012-10-13 09:45:33 -07:00
cib
4f1d301880 Examine now only reveals you're dead by checking pulse. 2012-10-13 08:57:03 -07:00
Chinsky
341275fa69 Fixes get_organ not working properly for eyes and mouth target zones. 2012-10-13 19:35:16 +04:00
cib
46f2864cd3 Ported BS12 player info system. 2012-10-13 08:34:45 -07:00
petethegoat@gmail.com
c4f9b43020 Moved para and sleepy pen defines out of weapon.dm. 
Updated flashlight code a little.
Added inhand sprites for desk lamps.
Standardised modules/paperwork.
Decapitalised a bunch of mining items.
Slightly reverted update_icons.dm, so we're not looping through mutations more than we need to. Also, skeletons can now wear lipstick!

A few other things which aren't worth listing individually.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4855 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 14:37:28 +00:00
headswe
2326abe31b Merge pull request #1754 from Whitellama/master 
Ports/Fixes for the merge!
 2012-10-13 07:00:40 -07:00
cib
98386354bb Fixed a bug in radio code where it would expect the user to be a human. 2012-10-13 06:37:18 -07:00
cib
9c55f8c8ac Ported BS12 medbots. 2012-10-13 06:33:05 -07:00
cib
8dc75dfa3c Fixed the problem where :h would be holosay even for cyborgs. 2012-10-13 05:46:09 -07:00
Chinsky
9cc4470af8 Fixes lack of children organs. 2012-10-13 16:26:15 +04:00
Travis Whitehead
5184ca58f5 Roller beds are collapsible and the ChemMaster lets you specify pill/bottle color, once more 2012-10-13 03:44:19 -07:00
Travis Whitehead
524265b872 Fixed Moderator text color in OOC + Mods no longer see admin logs 2012-10-13 03:39:33 -07:00
Kortgstation@gmail.com
304ac5e6c3 Changed the way corpses get named (cause the old one isn't working). They just take the landmark name as their name. 
Tweaked my away mission spawn points/loot/enemy locations, and named all the corpses correctly this time.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4852 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 04:06:32 +00:00
johnsonmt88@gmail.com
a65f8c3ff8 Admin Observers have lost two verbs: 'gibself' and 'investigate' by request. 
Telebacon has been commented out. Fixes(haha) issue 999.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4851 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 03:10:34 +00:00
Kortgstation@gmail.com
bc52355d77 Bluespace artillery actually checks for its cooldown between shots now. 
Syndicate simple animals wont shoot a corpse forever. They also fire slightly less frequently in general.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4850 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 01:35:34 +00:00
cib
9ae4bbfdf8 Fixes the say_quote runtime. 2012-10-12 16:15:34 -07:00
cib
c0e0e7d116 Remove the silly examine messages that give away wounds even when under clothing. 2012-10-12 15:47:01 -07:00
baloh.matevz
952954446b - Added ground code for logic elements. Currently supports sensors, indicators, negators, two input and gates, or gates, xor gates, xnor (equivalence) gates and a relay, with one control input that works by logic laws and another input and output that work by powernet laws. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4849 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-12 22:46:24 +00:00
cib
c691f76c65 Small bug with engineering cyborg radio channels. 2012-10-12 15:34:40 -07:00
cib
e05b9fa2b6 Fixed a runtime with organ generation. 2012-10-12 15:03:32 -07:00
cib
06d47ea2dd Cyborgs can now use their respective channel. 2012-10-12 14:56:34 -07:00
cib
32e839f683 More and yet more fixes from the piratepad. 
- AI laws now default to Nanotrasen laws
- Removed half the random events
- Milk now in chem dispensers
- Hunger rate decreased by half
 2012-10-12 14:25:54 -07:00
cib
89263fc9f6 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-10-12 13:19:20 -07:00
cib
8c157bff18 Added missing groin. 2012-10-12 12:36:25 -07:00
Mloc
046348db49 Merge pull request #1744 from CIB/branch 
Several changes to organs + bugfix
 2012-10-12 12:15:57 -07:00
cib
99313f5a94 More fixes to wounds. 
- Added more wound descriptions
- Wounds now have "bleeding" and "bandaged" in their examine description
 2012-10-12 12:08:00 -07:00
cib
0aa3bde885 Fixed the problem where you don't get the game-panel verb. 2012-10-12 11:41:01 -07:00
baloh.matevz
96b53e1189 - Added numeric value polls. These allow multiple options to be present in each poll, each option has a drop-down list that goes from a low value (-3 in screenshot) to a high value (3 in screenshot), both of these can be set per-option. Along with text descriptors for the lowest value option, middle option and highest value option (In the screenshot 'Worst', 'no change' and 'Best') 
Example screenshot (if you ignore the poll text):
http://www.kamletos.si/numval%20polls.PNG

Also note that the screenshot above only has one option (or question). It can have an unlimited number.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4848 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-12 18:37:36 +00:00
Mloc
d4a67a7e66 Merge pull request #1741 from caelaislinn/bs12_with_tgport 
re-add asay >.>
 2012-10-12 09:43:08 -07:00
Mloc
33a3d3cd97 Merge pull request #1738 from CIB/master 
Dismemberment
 2012-10-12 09:42:31 -07:00
Cael_Aislinn
d59dc63fed re-add asay >.> 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-13 01:37:08 +10:00
Cael_Aislinn
a0c91e200d re-added missing admin verbs (bans, toggle ooc, msay etc) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-13 00:51:30 +10:00
Cael_Aislinn
3e11992cce re-added game panel for admins and added zas options, extended postgame restart delay from 25 seconds to 60 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-13 00:01:45 +10:00
Cael_Aislinn
6d4e17ac32 fix for alien species limiter bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 23:36:10 +10:00
Cael_Aislinn
6fc9aab4f6 some merge fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 18:21:50 +10:00
Cael_Aislinn
419247adfe Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/verbs/ooc.dm
	code/modules/admin/admin_verbs.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 17:53:17 +10:00