cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-20 07:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 7 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

9413 Commits

Author SHA1 Message Date
kortgstation@gmail.com
937ce838f7 Simple mobs who can attack (not Ian) can now destroy windows/grilles. 
Ectoplasm can now be used to make GHOST BURGERS.

Fixed a bug from my last commit involving simple mobs interacting with walls.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2978 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-20 19:52:27 +00:00
CaelAislinn
f1b2f77586 added pacman type II generator and the pacmanII circuit board. pacman2 runs off plasma tanks instead of coins, but doesn't output as much power (90% of the t1 gen, to be precise) and requires the same level of power storage tech to make as a super pacman. 
untested, but should work.

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-20 23:53:03 +10:00
cib
c07785371d Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-19 21:10:17 -08:00
cib
822c6e3923 Changes related to the response team. 
- There's now a chance involved with the response team spawning. The more people are dead, and the more antagonists there are, the higher the chance will be.
- You can now jobban people from the response team.
 2012-01-19 20:47:04 -08:00
Albert Iordache
df354af1f3 Merge pull request #294 from Tastyfish/master 
added L & R to zone_sel hud thing, check antag call shuttle, marked datum call proc
 2012-01-19 11:01:04 -08:00
Tastyfish
51780a5c05 Merge pull request #291 from SkyMarshal/master 
Radio and map update.
 2012-01-18 23:16:15 -08:00
SkyMarshal
18bd946668 Finally fixed the access stuff for medbay. It was a bug introduced by Doohl. 
Also made electric chairs amazing, but the sprite needs work.
 2012-01-19 00:12:24 -07:00
Tastyfish
06fce40d34 herped the mark datum thing 2012-01-19 01:54:48 -05:00
Tastyfish
1be9c4cfed check antag "call shuttle" overrides fake recall, can use marked datum as arg in the bs12 call proc command 2012-01-19 01:19:58 -05:00
vageyenaman@gmail.com
d12a3d898e Added a new telecomm thingie on the syndicate shuttle. It intercepts all radio chatter and relays it to the syndicate channel. Pretty nifty! 
Reverted the comm satellite layout. It should be much more balanced this way.

Some bugfixes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2975 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-18 04:52:34 +00:00
kortgstation@gmail.com
2ca407093d Hurr durr I'm fucking retarded forgot to compile after removing a line that caused a runtime 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2974 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-18 02:09:21 +00:00
Hawk-v3
7358dfa1a8 Merge pull request #289 from Tastyfish/master 
allow non-MMI brains to ghost (since they can't do anything), admin-spawnable bone repairing syrum
 2012-01-17 18:03:09 -08:00
Tastyfish
cc449f48c6 Merge remote-tracking branch 'upstream/master' 2012-01-17 20:36:03 -05:00
Tastyfish
d1fc384533 allow non-MMI brains to ghost (since they can't do anything), admin-spawnable bone repairing syrum 2012-01-17 20:34:12 -05:00
kortgstation@gmail.com
fab3c72b10 Added vars to simple animals to determine movespeed and if they can destroy walls. 
Did work on a construct simple animal, it is functional but lacking dead sprites/side sprites.

Added the north/south sprites for the construct by TankNut

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2973 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-18 01:23:52 +00:00
LastBattaWolf@hotmail.com
448cbee97b - Stop adding .wavs I swear to god I will punch all of you seriously all you have to do is download Audacity and press a single button to make something an .ogg you don't need to downsample or techwizardry at all you press ONE BUTTON aaaaaaaaaaaa 
- (Added for Rolan) Medscanners now have a toggleable option to check for injury on each limb, and the help intent now shows what kind of damage someone has on each limb.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2972 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-18 00:33:24 +00:00
SkyMarshal
f509cda7b0 Merge pull request #284 from Tastyfish/master 
added orderable chickens and cows
 2012-01-16 23:17:36 -08:00
SkyMarshal
0d7ce5f347 Port of the TG radio system. Tasty and I tested it out and it works smooth and clean :) 
We were able to restore functionality after we blew up half the radio equipment, as well.
AI satellite is now the Comms satellite.
 2012-01-17 00:12:30 -07:00
Tastyfish
53baf4755f Merge remote-tracking branch 'upstream/master' 2012-01-16 20:27:36 -05:00
Tastyfish
df208f7189 added orderable chickens and cows 2012-01-16 20:26:17 -05:00
trubblebass@gmail.com
306bc5a00c - Cyborgs now get the old syndicate lawset when emagged that replaces their current laws. Instead of just a Law 0 (authorised by Neo) 
- Xenobio Pen now has a remote Igniter. Button for it is on the table next to the shutters button.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2967 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-16 23:14:23 +00:00
vageyenaman@gmail.com
d87dca30c6 Makes puking less common. Corpses can no longer puke... 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2965 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-16 21:55:21 +00:00
vageyenaman@gmail.com
ffe42d1ca6 Quick fixes for my last commit. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2961 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-16 08:55:20 +00:00
vageyenaman@gmail.com
00119e0b4a ▫ Telecommunications is finally live. There's just too much to explain so I'm going to recommend you visit the wiki article on Telecommunications. 
▫ AI satellite replaced with Communications Satellite.
▫ Some turret tweaks. Gave "AI" turrets a variable that controls what type of lethal shots they shoot.
▫ New job access level, Telecommunications Satellite. The CE, RD, and Captain get this access level.


▫ Some icon tweaks and stuff.
▫ Faster chem machine energy regeneration rate.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2959 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-16 01:14:19 +00:00
polyxenitopalidou@gmail.com
112b352bbf •Issue 109 fixed 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2958 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-15 20:37:51 +00:00
quartz235@gmail.com
ce61604e79 - Walls, Rwalls, etc. now leave hidden prints when constructed 
- Biosuits can now hold pens and penlights in suit storage
- Syringe draw/inject icons are now overlay-based
- Syringes now use the same coloring overlay system as beakers (see: blood samples are now red, etc. etc.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2953 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-14 05:54:51 +00:00
Albert Iordache
725ec31a57 Merge pull request #278 from caelaislinn/master 
Fixed disposals error from using a grab on a disposal chute.
 2012-01-13 11:52:53 -08:00
VivianFoxfoot@gmail.com
553f56566f Readds the clusterbang. 
Eye damage over 20 units now causes permanent vision impairment, 
Eye damage over 30 units now causes permanent welder-vision.  
Eye damage is treated by Imidazoline or eye surgery.  Full blindness still only treatable by eye surgery. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2951 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-13 17:53:41 +00:00
CaelAislinn
07fb3f1eb8 fixed error from using a grab on a disposal chute 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-13 21:51:16 +10:00
VivianFoxfoot@gmail.com
8af7db096d Cleans up and uses less area checks, relying more on lastarea. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2949 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-13 06:01:32 +00:00
quartz235@gmail.com
ecc367e059 Forgot about decimals in my metroid runtime fix 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2948 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-13 05:02:50 +00:00
VivianFoxfoot@gmail.com
7ffdec48bf Fixes fire extinguishers in space, removes empty hand requirement, which wasn't supposed to be committed. My bad. 
Adds the ability for door buttons to both close the doors they're attached to, and also a framework for controlling their other functions like idscan/bolts.
Adds a secure safe to the HoS's office and a new flashbang grenade!  
Secure safes can now hold 8 weight units of stuff by default.  
Adds a reply function to the comm. console prayers as well as a confirmation button on BSA.  


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2946 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-13 02:15:22 +00:00
Albert Iordache
e3c4b0f88f Merge pull request #276 from SkyMarshal/master 
Weldpack added, not on map; Clipboards fit on belt; Wrapping is more robust.
 2012-01-12 11:43:39 -08:00
SkyMarshal
70cb3417ef Added weldpack, clipboards fit on belt, food and other things can now be wrapped 2012-01-12 11:13:05 -07:00
CaelAislinn
47451d9f53 conveyors in the mini outposts on the mining asteroid should now work properly 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-12 16:59:36 +10:00
Tastyfish
b5c8b89a4d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	code/WorkInProgress/Mini/customitems.dm
 2012-01-12 01:48:33 -05:00
Tastyfish
abefe71bba fixed derpy bug in spawning right dismembered foot 2012-01-12 01:47:15 -05:00
SkyMarshal
80761ed2e5 Added pink labcoat. 2012-01-11 22:21:26 -07:00
SkyMarshal
98b6019f99 Implanters now work properly. This is a bugfix. 2012-01-11 21:28:34 -07:00
Albert Iordache
25f7741772 Fixed a UI bug caused by the lack of var/over = 1 for PDAs 2012-01-12 16:58:46 +02:00
Albert Iordache
0a3ca62f53 Merge pull request #270 from Tastyfish/master 
Made custom items read from a config file.
 2012-01-12 01:02:00 -08:00
Tastyfish
a85e8eee50 Merge pull request #271 from caelaislinn/master 
conveyors on the mini mining outposts should now work properly
 2012-01-11 23:03:00 -08:00
SkyMarshal
54d3184f2a Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-11 18:13:35 -07:00
SkyMarshal
a47b399c32 Fixed bugs involving wrapping yourself in a closet. Added a new centcom uniform sprite, and added checks to keep them looking pretty. Added a cancel button to deathsquad button. Adjusted admin spawnable complete uniforms, so that centcom officials look pimp'n. Added a layer of internal armor (special invisible exosuit) that spawns on centcom officials. Centcom berets are no longer space helmets. Added missing reactive teleport armor sprite and fixed it's functionality. 2012-01-11 18:13:02 -07:00
SkyMarshal
dc87ddc766 Missed a flag 2012-01-11 12:42:29 -07:00
SkyMarshal
3d9658178a Removed space capability from captain's armor. 
Added memo on his desk informing him.
 2012-01-11 12:34:45 -07:00
SkyMarshal
3c5cc5f3b3 Fixed some broken sprites and odd behavior of the Reactive Teleport Armor 2012-01-11 12:29:59 -07:00
Tastyfish
f922994c71 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	code/modules/recycling/sortingmachinery.dm
 2012-01-11 00:26:42 -05:00
Tastyfish
12a9c075c8 added overlays for labelled and tagged packages 2012-01-11 00:24:02 -05:00
Tastyfish
f404ea91d6 Merge pull request #260 from SkyMarshal/master 
Disposal updates + map fix, traitor objective fix, Cult teleport talisman now teleports grabs
 2012-01-10 20:38:14 -08:00