cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,608 Commits 6 Branches 0 Tags
02da71b38d64c8fc8ac25a6cd51a628cb42feefd
Commit Graph

586 Commits

Author SHA1 Message Date
cib
f6dcb3d079 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-28 19:00:56 -08:00
SkyMarshal
f096580734 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-28 21:32:56 -07:00
SkyMarshal
820f3c1242 Merge pull request #324 from CIB/master 
Stuff
 2012-01-28 20:31:25 -08:00
SkyMarshal
21a648dc73 Added certificate of awesome, centcom stamp, removed broken gamemode 2012-01-28 21:30:43 -07:00
cib
0b71628c05 Fixed a typo. 2012-01-28 18:35:22 -08:00
cib
e14dfc5ace Added autopsy. 
- When a human is attacked, data about the weapon is added to a special wound datum on the organ.
- This data can be extracted and processed by opening up the limb and using an autopsy scanner on it.
- Added the autopsy-scanner to the map.
 2012-01-28 02:26:44 -08:00
SkyMarshal
3e9146f99a Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	maps/tgstation.2.0.8.dmm
 2012-01-28 02:03:42 -07:00
SkyMarshal
0e51764af4 Final load of bugfixes. Moved ported stuff to a subdirectory in Work in Progress, telecomms bugfix, fix for solar trackers, some human and monkey procs. 2012-01-27 22:55:16 -07:00
SkyMarshal
12afd61ffc Ported Uplinks, Door stuff, Hacktools, Compressed Matter implant. 2012-01-27 20:15:06 -07:00
Hawk-v3
6bf4e70727 Power Control Computer can now remote toggle APC main circuit breakers! 
Codegift from Newt.
 2012-01-28 02:40:38 +00:00
SkyMarshal
cd5e2476bd Added a new object, for storing premade outfits, that is in clothing closets. 
Added clothing closets for several new jobs (Chef, Bartender, Virologist, etc.) and outfitted them.
Paper can now be burned, and acts as a hotspot and a light source when it is on fire.
Tweaked the Allinone broadcasters
Nerfed electrical storms
Response Team leader gets a special assignment/title.
Remapped to add Copiers, Filing Cabinets, and wardrobes
 2012-01-26 22:19:33 -07:00
SkyMarshal
336284127b Fixed a bug 2012-01-25 14:35:59 -07:00
SkyMarshal
81b8520c61 More flexible RCD ammo stuff. 2012-01-25 14:16:11 -07:00
SkyMarshal
d61626440c Response Team Update: 
-Response team now have a pimp'n base, containing gear for the leader as well as Medical, Engineering, and Security special loadouts.
-TG updates for comms and mulebot
-Special medical tools for response team
-Increased time between events slightly.
-Map updated with nerfed comm satellite, and added Death Alarms in medbay in addition to the new Response Team area.
 2012-01-25 11:51:55 -07:00
SkyMarshal
1bf1d5db1f Pimped out the response team. No jobs have stupid stuff spawn in their hands, it now spawns on their person, be it on their ear (pens if they cannot find a target) of in their pockets. MAde several pre-set-up things for the response team, including portable surgery equipment and a movable optable. Made autolathe items spawn on top of it. Added Death alarms, and made explosive implants work properly. Girders are now removed when a floor is made/RCD'd into existence. Internals can now be set even if it is in suit storage or on the belt. 2012-01-20 12:53:29 -07:00
vageyenaman@gmail.com
9cc379273e TG update: Vending machine GUI overhaul. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2694 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-17 11:49:03 +02: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
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
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
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
25e1633487 Merge pull request #259 from Tastyfish/master 
Took long enough to fix this damn bug.
 2012-01-10 20:39:05 -08:00
Tastyfish
763c9ec07b paint is reagent, fixed ai core bug 2012-01-10 18:05:19 -05:00
Miniature
225b2ad03e fix runtimes in disposals pipes and seed making for a plant 
whoever coded those parts should be shot
 2012-01-10 10:56:58 +10:30
Tastyfish
6cdae453b2 Merge pull request #249 from caelaislinn/master 
made body bads orderable via qm
 2012-01-08 23:07:32 -08:00
CaelAislinn
179ae3c2e4 made body bags orderable via qm 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-09 14:30:22 +10:00
Albert Iordache
9d2e285190 Fixed a bug with obj/item/clothing/under/chameleon/psyche , added some small details to Antiqua and redid the arrivals arm, and removed the patient ward area. (can still be recovered via TortoiseGit, by reverting to an earlier version; I'll explain in the Antiqua topic why I removed it) 2012-01-08 19:19:53 +02:00
SkyMarshal
9a651a5a84 Added psyche jumpsuit for Asanadas 
Expanded scrambled radio stuff.
 2012-01-03 00:06:25 -07:00
SkyMarshal
411ccc4075 Shitload of stuff. 2012-01-02 21:48:42 -07:00
Albert Iordache
d9683ef4e3 Merge pull request #192 from caelaislinn/master 
Autolathe changes, new supply crates, slight cargo bay tweaks
 2012-01-02 06:36:03 -08:00
CaelAislinn
fe228850c8 Added old BS12 walllockers and emergency lockers, added emergency lockers to tgstation208.dmm, removed stamp eraser from supply crate, minor antiqua tweaks 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-02 23:47:28 +10:00
CaelAislinn
9fa489a0d1 finished autolathe changes. added stationary, box and empty supply crates to supply shuttle. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-02 21:38:27 +10:00
cib
40fb4bb628 Mucus and a few fixes to vira. 
Added mucus that is added to the map sometimes when sneezing or coughing. Blood now carries the spiller's virus2. Fixed a problem with virus spreading.
 2012-01-01 20:50:46 -08:00
SkyMarshal
648199a82f Remove clown/mime costume crate, after a HoP went and started derping around with it. 2011-12-30 11:00:02 -07:00
SkyMarshal
5ab20fdf55 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/items/weapons/uplinks.dm
 2011-12-29 10:08:58 -07:00
cib
b5f8c930f1 Revert SkyMarshal's last commits since they don't even compile, which means they weren't tested. 
Revert "Alien removal surgery, new traitor item, other stuff."

This reverts commit cc3bc60963.
 2011-12-29 15:15:51 -08:00
SkyMarshal
cc3bc60963 Alien removal surgery, new traitor item, other stuff. 2011-12-28 23:15:30 -07:00
SkyMarshal
43c2285a93 Fixes and stuff. 2011-12-28 14:27:52 -07:00
Tastyfish
6e95fc4f1d better yet, let both apc module and disposal circuit be creatable in autolathe 2011-12-28 06:12:21 -05:00
CIB
7270012d01 Merge pull request #149 from SkyMarshal/master 
Added holster to detective's suit, fixed some spelling mistakes.
 2011-12-26 15:48:04 -08:00
ryantennessee@yahoo.com
cf6ccb5650 TG update: Fixed some spelling errors in item descriptions. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2688 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-27 00:16:48 +02:00
uporotiy
ab396f50ac TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2683 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 23:39:45 +02:00
SkyMarshal
4addb7ddb7 Added holster to the detective's suit, and fixed spelling mistakes on the coat rack. 2011-12-26 09:14:43 -07:00
SkyMarshal
de67b05dce More updates. The evidence bags are kinda borked. 2011-12-26 00:03:05 -07:00
SkyMarshal
9becacf956 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-25 08:48:06 -07:00
trubblebass@gmail.com
9b84f88ebb TG update: Botany fixes courtesy of Numbers: 
- Adjusts a few nutrient values for plants.
- Fixes the weird messages produced by Chantrelles.
- Nettles breaking has also been fixed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2666 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-25 15:47:15 +02:00
SkyMarshal
c6499583b4 Updated. 2011-12-25 00:07:42 -07:00
Tastyfish
a302464d3b Merge remote-tracking branch 'upstream/master' 2011-12-23 02:22:39 -05:00
Tastyfish
d14b67782a added being able to backup sec/med records to disks, ejecting card trys to put it in your hand before dumping it ontop 2011-12-22 05:34:05 -05:00
Albert Iordache
09d7739b08 Fixed a runtime error related to all items now being checked for var/protective_temperature and fixed another runtime error by doing something unholy. 2011-12-22 00:12:29 +02:00