cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,692 Commits 7 Branches 0 Tags
3202ac4ccfe2bcbf13b62033e6d10499fd244705
Commit Graph

8964 Commits

Author SHA1 Message Date
Cael_Aislinn
bb4be2c86a moved cryo cells to the same layer as tables - this will look weird for stuff on the top tile ('behind' the cry cell) but beakers wont be hidden underneath it when they're ejected any more, fixed typo in escape shuttle, fixed syntax error in new player setup screen 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 19:25:19 +10:00
Cael_Aislinn
66ce65a680 minor tweaks and cleanup with events, readded meteor shower and grid check events, removed most unused event files (left some interesting ones) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 19:15:38 +10:00
Cael_Aislinn
351e6d490c empty guns play a "click" sound 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 18:47:36 +10:00
Cael_Aislinn
632cad1044 observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 18:47:03 +10:00
d_h2005@yahoo.com
e15c63d100 -New chicken sprites! Other minor tweaks to chicken code, slows them down some and notches the lay rate back a bit. 
-Fixes invisible cane inhands.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5595 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-21 06:02:30 +00:00
giacomand@gmail.com
0b3ed70a2a - Changed the min/max damage of plasma to be less deadly. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5594 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-21 03:42:21 +00:00
Cael_Aislinn
05479bdb96 removed many alt_titles 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 12:07:49 +10:00
ericgfwong@hotmail.com
4d9af5c0a4 Recolored a bunch of objects to make medbay's department colours more clear and consistent. The colours are green/white. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5593 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-21 00:11:48 +00:00
giacomand@gmail.com
2c354562ad - Made flamethrowers use afterattack() instead of /turf/DblClick(). 
- Gave engineer vending machines air alarm electronics.
 - Replaced a magic number with what it is defined by.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5592 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-20 23:10:36 +00:00
d_h2005@yahoo.com
c8a15aef72 Chickens will now lay a certain number of eggs per wheat fed to them. This changes the process from a passive one that happened regardless of user input to an active one that requires conscious effort. Bkaw. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5589 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-20 20:49:02 +00:00
Cael_Aislinn
0752ca2fff changed erroneous name in sec hardsuit, reverted some derpy chemistry merging 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 05:38:04 +10:00
Cael_Aislinn
20aa136a08 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/game/machinery/hydroponics.dm
	code/modules/reagents/Chemistry-Reagents.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 05:05:17 +10:00
Cael_Aislinn
082af8f638 removed some duplicate events code brought in by mistake during tg port, fixed space ninja spam, renamed 'NSV Exodus' to 'NSS Exodus' 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 04:56:20 +10:00
Cael_Aislinn
3e6283403f cleanup of alt titles handling, made sechuds able to see icons for the real job if players have an alt title, made custom job titles via id computer into alt titles 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 04:55:02 +10:00
cib
5c97214b97 Removed an instance of spawning space ninjas I overlooked. This one would cause a space ninja to be spawned on every round, 6 minutes in. 2013-01-20 18:54:29 +01:00
Cael Aislinn
901741aa70 Merge pull request #2203 from comma/master 
Map update and pose system
 2013-01-20 08:53:00 -08:00
Kortgstation@gmail.com
b0077b3498 Removed nanoaugs, they were unbalanced and never used outside of badmins shitting things up. 
They also added extra checks to

-Everytime a mob attacked (checking for super strength and electric hands)
-Every time a mob was attacked (checking for dermal armour)
-Every time a human was shot (checking for reflex)
-Every time a human breathed (checking for rebreather)
-Every tick of human life (checking for regen)
-Every hud update (checking for radar)

Not to mention just cluttered mob code in general. I know there won't be any noticeable performance increase from this but seeing as they were never going to be finished (I asked Doohl beforehand) and mob code is messy enough as is, I think only good can come of removing the code.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5587 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-20 10:45:20 +00:00
d_h2005@yahoo.com
e2391d2eb8 -Gives nicer colors to reagents where needed. Mostly affects the fancier cocktails. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5586 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-20 04:23:13 +00:00
ericgfwong@hotmail.com
ef30d79392 Replaced medical hardsuits in EVA with security hardsuits. Sprite by Ausops (Modified to add a helmet light) 
https://dl.dropbox.com/u/831776/sample.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5584 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-20 00:44:09 +00:00
giacomand@gmail.com
9f887f3f17 - Committing SuperSayu's improvement to vending machines, making them use type paths instead of strings of type paths. http://forums.nanotrasen.com/viewtopic.php?f=16&t=11878 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5583 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-19 21:31:07 +00:00
entrian.tration@gmail.com
7516e0698b Issue 1231 resolved with http://forums.nanotrasen.com/viewtopic.php?f=16&t=11769 
Armor now appropriately reduces damage taken from explosives.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5582 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-19 21:15:11 +00:00
Chinsky
f04185024a Moved pose text lower per suggestions on forums. 2013-01-19 22:53:44 +04:00
d_h2005@yahoo.com
ec46676bac Fixes issue 1241 - Blood soup looks like tomato soup now instead of meatball soup. Removed the blood soup sprite. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5581 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-19 16:50:55 +00:00
Chinsky
03321fa04d Used BYOND macro instead. 2013-01-19 12:42:06 +04:00
Chinsky
fa7f2327ce Added Set Pose verb. 
Sort of passive emote, which is seen when mob is examined.
 2013-01-19 11:26:54 +04:00
cib
8de6998d83 Removed space ninja random event. 2013-01-18 23:37:51 +01:00
Kortgstation@gmail.com
9659910f80 Viruses don't spread via blood/vomit pools any longer. 
Reasoning in this thread

http://forums.nanotrasen.com/viewtopic.php?f=18&t=11894

If people really want to make viruses garbage collected instead then whatever I guess, but I still think not having those 500 viruses at all is better than them being spawned, processing, then being garbage collected (or deleted after all if anyone cleans the decals).

Should probably look into lessening the vomit rate as well.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5579 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-18 22:37:25 +00:00
aranclanos@hotmail.com
7ae3dfa040 Runtime fixes for building computers with mech boards or an AI core circuit. I changed their board_type to "other" instead of the default one, "computer" 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5578 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-18 22:10:36 +00:00
giacomand@gmail.com
95392cae87 - Fixed retaliating simple animals acting weird and added some minor improvements. They should act better to mechs. 
- Decreased the amount of possible chickens you can get from the crate.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5577 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-18 19:54:00 +00:00
aranclanos@hotmail.com
569378878d Runtime fix for trying to build invalid objects and circuits on the protolathe and circuit imprinter, respectively. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5576 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-18 19:17:08 +00:00
aranclanos@hotmail.com
a4d74b10c4 Runtime fix for trying to remove a missing beaker from the cryo tubes. The beakers now drop one tile down of the cryo instead of the tube location, it's more visible now. 
Completed the runtime fix of r5574.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5575 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-18 17:48:07 +00:00
aranclanos@hotmail.com
96d8d78e3e Runtime fix for trying to open deleted records on the cloning machine. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5574 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-18 16:44:12 +00:00
giacomand@gmail.com
35fbc6b1c7 - Implant pads will no longer be stuck inside your pocket. Fixes Issue 1058. 
- The free objective for cultists will be an automatic success.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5573 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-18 10:51:41 +00:00
Cael_Aislinn
94447740e9 halves the speed of everything in hydroponics 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-18 15:36:02 +10:00
baloh.matevz@gmail.com
f873b86b35 - Small edit to the movement killswitch. The person who enables it will now be allowed to move, so he can try to detect any change to lag. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5572 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-18 03:12:43 +00:00
baloh.matevz@gmail.com
3d0d03a74f - Added killswitches to say, whisper, me, ooc, adminhelp and pray to try to determine if communication verbs are the cause of the constant lag we're getting. Toggle the killswitch with the 'disable communication verbs' verb, available in debug verbs. 
- Added killswitches to all Enter() and Entered() procs to try to determine if movement is the source of all the constant lag we're having. Toggle the killswitch with the 'disable all movement' verb, available in debug verbs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5571 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-18 03:04:46 +00:00
entrian.tration@gmail.com
32c65d614d Now you can properly profile all the components of the master controller. Preliminary tests show machines in aggregate are more processor intensive than atmospherics. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5570 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-18 01:19:03 +00:00
giacomand@gmail.com
e6d0ec4859 - Major optimisations to handle_reactions(). 
How is this an improvement? Before we looped through every possible reaction to see if a reaction would occure with our list of reagents. Now we already make a list of reagents which can have a reactions, cutting down on searching every single time. This will decrease the loop expensive iterations from 100s to only a handful.

How does it work? We format our chemical_reactions_list like this:

chemical_reactions_list[reagent_id] = list()

And then we fill that list of possible reactions. Thanks to Exadv1, to cut down on redundancy we only need to have a reaction in a single list at a single time, because our handle_reaction() loop will handle that.

Here is a paste of the structure of the list on runtime. http://privatepaste.com/327bb61628

(has: = an entry in the list that it is nested in)

 - Fixed mecha weapons shooting over people lying down.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5569 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-17 20:34:47 +00:00
giacomand@gmail.com
71ba8dfcd2 - Fixed design IDs not being unique. They should be constructable now. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5568 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-17 14:07:03 +00:00
Cael_Aislinn
64640450f5 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-01-17 18:20:17 +10:00
Cael_Aislinn
d321a3aaf2 removed two more unused files 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-17 18:19:50 +10:00
giacomand@gmail.com
015b19f800 - Added null checks for get_mobs_in_radio_range(). 
- Added a check to EI NATH for humans who are brainless.
- Fixed fires runtiming. When I replaced del(src) with a garbage collecting proc, I forgot to return afterwards so the rest of the code didn't execute.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5567 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-17 06:52:49 +00:00
baloh.matevz@gmail.com
388dfd8bc3 Set the access levels for jobs, when 'minimal access levels' is not enabled. This is intended for servers with low populations. The access levels for jobs are: 
bartender, chef, botanist: hydro, bar, kitchen, morgue
cargo tech, mining, quartermaster: maint, mail, cargo, mule, qm, mint, mining, mining station
clown: clown, theater, maint
mine: mime, theater, maint
janitor: janitor, maint
librarian: library, maint
lawyer: layer, court, sec door, maint
chapel: morgue, chapel, crematorium, maint
ce: no change
station engineer, atmos tech: eva, engine, apc, tech storage, maint, external, construction, atmospherics
cmo: no change
doctor, chemist, virologist: medical, morgue, surgery, chemistry, genetics
geneticist: same as doctor + science
rd: no change
scientist: robotics, tox, tox storage, research, xeno
roboticist: robotics, tox, tox storage, tech storage, morgue, research
hos: no change
warden: sec, sec doors, brig, armory, court, maint, morgue
detective: no change
sec officer: security, sec doors, brig, court, maint, morgue

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5566 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-17 06:36:18 +00:00
aranclanos@hotmail.com
a8cb1dc4f8 Some improvement to the teleport scroll and spell code. It unbuckles the user now. 
Thanks to Nodrak~

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5565 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-17 06:22:29 +00:00
johnsonmt88@gmail.com
1f07f31b64 Grammar fixes for item-suicides. 
I got about half-way through changing these when SuperSayu came up and said he fixed this a while ago but never posted the fix. So technically half of these were fixed by me and half by him. Credit to both of us!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5564 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-17 02:52:57 +00:00
Cael Aislinn
a5c1cf781a Merge pull request #2185 from CIB/feature 
Autopsy scanner fixes
 2013-01-16 17:57:35 -08:00
Cael Aislinn
f472e07cc1 Merge pull request #2194 from comma/master 
Surgeray
 2013-01-16 17:57:05 -08:00
Kortgstation@gmail.com
4f95636530 Slimes can no longer be buckled to things, they're too squishy (people were abusing the fact that slime AI can't unbuckle) 
Golems get head protection from their suit now and have their head slot clear so you can tell em apart with hats.

Fixed a typo related to slime surgery that I assume has been around since metroids were added how did nobody notice this thanks Failcakes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5563 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-17 00:59:18 +00:00
Chinsky
69e06802ab Fixed issue #2158 
Now shutters will work with crowbar without asking.
 2013-01-16 22:09:03 +04:00
Chinsky
a2073134b3 Fixed runtimes in airflow. 2013-01-16 22:05:31 +04:00