cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 21:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,126 Commits 8 Branches 0 Tags
5628272bde0235f752765d64ea1462ed9f51a724
Commit Graph

553 Commits

Author SHA1 Message Date
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
SkyMarshal
dafd9d68f9 Final revision of Security Console (Hopefully.) 2011-12-19 23:24:00 -07:00
SkyMarshal
14ac797deb Should finialize the improved Security Console 2011-12-19 22:12:04 -07:00
SkyMarshal
618fd87f35 Not done yet. 2011-12-19 11:01:24 -07:00
MlocMcMloc
7f540f6811 Merge pull request #121 from SkyMarshal/882fb96574109859b6e503804190390b27e1c738 
Yet again, check the description.
 2011-12-19 08:09:25 -08:00
SkyMarshal
1c67be2707 Several fixes/additions. Will list in pull request. 2011-12-18 20:56:39 -07:00
Tastyfish
e85b253eb3 Merge remote-tracking branch 'upstream/master' 2011-12-18 06:12:21 -05:00
Tastyfish
7d48e87e2a made 2-eared setup prettier 2011-12-18 06:12:00 -05:00
Albert Iordache
bca2746d7c Fixed a spelling mistake. 2011-12-18 13:05:18 +02:00
Albert Iordache
f4a24a9804 Merge pull request #118 from SkyMarshal/master 
Removed a lot of goonish flavor text, resprited emag and centcom id.
 2011-12-18 03:03:04 -08:00
Tastyfish
e3219fd09d 2 ears! 2011-12-18 06:02:15 -05:00
SkyMarshal
fda118e9ac Reworked emag again, new centcom id sprite, removed derpy flavor text. 2011-12-18 03:20:54 -07:00
Albert Iordache
1816be90a0 Merge pull request #117 from SkyMarshal/master 
Again, check description.
 2011-12-18 00:28:53 -08:00
SkyMarshal
3d51c2487b Fixed a bunch of descriptions. 2011-12-18 01:06:05 -07:00
SkyMarshal
fc3914364f Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs. 2011-12-18 00:23:02 -07:00
Tastyfish
75ddaeb9f9 Merge remote-tracking branch 'upstream/master' 2011-12-17 21:52:05 -05:00
Tastyfish
a741413992 carve books, remove immovable rod/gr3y t1de 2011-12-17 20:46:42 -05:00
SkyMarshal
159ce32cc7 Improved pepper spray, added a safety catch to pepper spray and space cleaner, added a wire to reset the module of a borg. 2011-12-15 23:58:17 -07:00
Tastyfish
61ae382c16 added categories to QM stuff so it isn't a giant several-page list 2011-12-10 01:25:27 -05:00
Albert Iordache
3efa552eda Merge branch 'master' of https://github.com/Miniature/Baystation12 into Miniature-master 
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
 2011-12-09 14:56:32 +02:00
Tastyfish
14f0a4d0b9 UnRevert "the closet tg merge broke my charge crates" 
This reverts commit 2694238e88.
 2011-12-06 21:04:41 -05:00
Tastyfish
ecb6f2b2d6 Revert "the closet tg merge broke my charge crates" 
This reverts commit 2694238e88.
 2011-12-06 21:00:08 -05:00
Tastyfish
2694238e88 the closet tg merge broke my charge crates 2011-12-06 20:35:07 -05:00
Miniature
af301633f6 Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
 2011-12-07 07:53:20 +10:30
uhangi@gmail.com
44c0cfc46d -Adding pepper spray for security officers. 
-Fixed a storage bug for chemsprayers and space cleaner

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2618 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 22:42:18 +00:00
baloh.matevz@gmail.com
9c872b28e1 Reinforced metal renamed to steel, since that what it now is. 
Steel floor tile renamed to metal floor tile to avoid confusion before it even happens
Grass plants in hydro will now actually make grass floor tiles instead of really awkward patches
You can no longer make steel via autolathe, you can however make metal, and inserting r-metal will still give you metal for use in the lathe
Added 10 sheets of steel to EVA and 10 units of steel to engineering


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2604 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 03:55:58 +00:00
petethegoat@gmail.com
5d4b707553 Fixed all known problems with vending machines. 
Fixed a minor visual bug with emagged lockers.
Minor botany rebalance by Numbers.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2595 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-03 15:36:17 +00:00
Miniature
f62eccc76b Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm
 2011-12-03 19:28:10 +10:30
n3ophyt3
67e43e4baf New toy, as coded by Threadstrong. 
A delightful fake sunflower, that also doubles as a squirtgun. Refillable via watertanks.

Currently adminspawn only because I am too lazy to make it spawn anywhere right now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2589 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-02 01:51:40 +00:00
petethegoat@gmail.com
a80e46c078 Fixed issue 222. 
Improved closet/secure closet/crate code a bit. (Updated the paths on the map.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2585 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-01 20:02:43 +00:00
Tastyfish
26e1bfdaf1 Added vending charges, removed clown/mime from main joblist, sec belts fixed 2011-11-30 18:34:43 -05:00
petethegoat@gmail.com
85cb13fe95 Reverted the janitor closet to the old trashbag. (It does work, I fixed it up in r2557.) 
A bunch of fixes for various stuff that's been broken about the bag of holding. It should work as intended, now.
Made wet floor signs fit in boxes.
Cleaned up the janitor's closet a bit.
Optimised the vault wiring a bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2580 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-30 15:02:01 +00:00
kortgstation@gmail.com
763c0ecf71 Can now make light tubes/bulbs in the autolathe 
Old trashbag was buggy as fuck and useless. Didn't touch it's code, but replaced it's spawn in the janitors locker with a 20 slot, tiny item only storage object (new trashbag)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2577 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-30 05:35:40 +00:00
Tastyfish
e58dd6030f Auto-flush disposals, auto-hush vendending machines 2011-11-29 02:42:08 -05:00