cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,575 Commits 8 Branches 0 Tags
098ec4138d77c76d79644fd0f64f87260437bb00
Commit Graph

1941 Commits

Author SHA1 Message Date
headswe
098ec4138d Merge pull request #44 from Tastyfish/master 
Added multiple character slots! ie #31
 2011-11-29 16:45:06 -08:00
Tastyfish
719002dbee Added multiple character slots! 2011-11-29 19:32:07 -05:00
headswe
f426d9b5df Merge pull request #42 from Miniature/master 
Arrivals scanner
 2011-11-29 09:25:09 -08:00
Head
e1df14b5c1 Forgot to call makejson() 2011-11-29 18:15:49 +01:00
Miniature
1c01524055 Arrivals scanner stuff, now has sprite, new name, and uses power 
Just needs jobban stuff, then should be fine to add to a map
 2011-11-30 01:19:41 +10:30
Head
43d71282e0 Added back json support / restart notice 
should fix unnecessary restart after gamemode change before round start
 2011-11-29 15:45:01 +01:00
Miniature
d4ae76820b Fixedish the arrivals scanner, still need to add circuitboard to it 2011-11-29 22:57:57 +10:30
Miniature
fbf18ddd7e Arrivals scanner 2011-11-29 22:57:35 +10:30
Miniature
0e129ba6ce No more random end sounds 2011-11-29 22:50:29 +10:30
Albert Iordache
9179612571 Merge pull request #36 from Tastyfish/master 
Auto-flush disposals, auto-hush vending machines
 2011-11-29 02:14:31 -08:00
Tastyfish
26093c367e Merge remote-tracking branch 'upstream/master' 2011-11-29 02:51:52 -05:00
Tastyfish
e58dd6030f Auto-flush disposals, auto-hush vendending machines 2011-11-29 02:42:08 -05:00
CompactNinja
f003685c57 Commented out talking vending machines, as they are fucking annoying. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-11-29 16:49:09 +10:30
CIB
2ac5d5aa94 Merge pull request #34 from Tastyfish/master 
changes company name, game-mode minimums
 2011-11-28 21:36:38 -08:00
Tastyfish
e89488975f we work for NanoTrasen! Also, we don't have enough people for your fancy 
15-person minimums
 2011-11-29 00:19:37 -05:00
CompactNinja
6df7528b16 Bunch o hair stuffs. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-11-29 14:03:52 +10:30
Baystation12
74cc33fc02 Merge pull request #24 from CIB/master 
SMES' units have a lot more initial charge now, making life a bit easier for engineers
 2011-11-25 23:34:30 -08:00
cib
b00b9674b8 SMES units have a higher initial and maximum charge now. 2011-11-24 23:24:38 -08:00
Albert Iordache
4a4353e1fc Commented out some more forum-sql related code 2011-11-24 13:41:20 +02:00
Baystation12
c1cc954e94 Merge pull request #22 from Tastyfish/master 
Merged tg's and bay12's paper code, and closed a possible exploit.
 2011-11-24 03:21:07 -08:00
Tastyfish
cc14ed34a5 Merged best of tg's and bay12's paper code, and closed a possible exploit 2011-11-23 23:09:18 -05:00
Albert Iordache
34c84bbd6d Adding to #8. Edited README.txt, removed forum_activation.dm from the .dme, and added in the hub password 2011-11-21 20:44:57 +02:00
Albert Iordache
9440d9d296 Renamed tgstation.dme to baystation12.dme, added Bay12 admin list and moved a few admin verbs around from Game Master to Game Admin. 2011-11-21 20:01:13 +02:00
rockdtben
e7a0a44ea4 Implemented adjustToxLoss(amount) 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2535 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-20 10:25:24 +02:00
petethegoat@gmail.com
fcddc199ff New chem dispenser interface, by Tobba. Some sanity checking in power.dm, by Tobba. 
Updated changelog, by PETE YEAAAH.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2532 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-20 10:24:17 +02:00
vageyenaman@gmail.com
8f734c9bc6 ◦ Toggling midis will now disable the current midi(s) playing. How fucking cool is that?? ◦ Fixed a bug for metroids: the AI loop was not canceling when a player was inserted into the mob. 
◦ A few icon additions for future updates, namely the terminals and plasmatoids.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2531 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-20 10:21:34 +02:00
StrumpetPlaya
593e380133 Screen flashes red when hit by melee or projectiles. 2011-11-20 02:54:48 -05:00
StrumpetPlaya
1c580d1359 Speech Bubbles. 2011-11-20 01:23:55 -05:00
Baystation12
c80c66a0ae Merge pull request #12 from NivvyDaSkrl/master 
Fastler's changes: added ID requirements to mining processing/stacking consoles
 2011-11-19 02:58:27 -08:00
Albert Iordache
e72ec83af6 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-11-19 10:51:02 +02:00
Albert Iordache
028014415f Merge branch 'master' of https://github.com/Abi79/tgstation13-git 
Conflicts:
	html/changelog.html
 2011-11-19 10:48:17 +02:00
Zachary Wilson
cad1a9eba7 Fastler's changes: adding ID requirements to mining consoles. 2011-11-18 12:14:13 -06:00
unknown
1254a34822 Test Commit - Reduced running speed to be similar to BS12. Increased 
walking speed.
 2011-11-18 00:24:28 -05:00
petethegoat@gmail.com
5545d032be Experimental DMF vending machine update, by Tobba. 
Pretty sure everyone who cares knows about this already, but the low down is that shit is more responsive and potentially prettier.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2529 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-18 00:45:50 +00:00
rockdtben
38d90773cc Implemented getToxLoss() 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2528 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-17 23:42:09 +00:00
petethegoat@gmail.com
5b81f6ffa3 Additional borg skin choices for the Security, Engineering, Medical, and Janitor modules removed. 
New sprites by vey added.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2527 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-16 22:47:37 +00:00
petethegoat@gmail.com
d49739c021 Fixes issue 178. Including placing modules into disposals. 
Removed the maze button from the admin panel, no more dumb runtimes from that.

Window fix by Tobba, which lets you attack a window with a crowbar when you're unable to pry it into or out of the frame.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2526 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-16 20:42:05 +00:00
kortgstation@gmail.com
f87dfdd6a9 Fixes from HG/adding his new suit to the "Select Equipment" verb 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2524 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-16 09:08:31 +00:00
petethegoat@gmail.com
0a51f81d32 Chemistry bugfixes by Tobba! 
Reagent grinders are capable of outputting multiple reagents, improved internals of it a lot.
Fixed a bug with sheets inserted into the reagent grinder, you now get proper amounts.
Fixed a bug with beakers with liquid not inserting properly.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2523 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-16 00:48:32 +00:00
Zachary Wilson
8f61d60d64 Corrected issue #8 on Baystation12/Baystation12. 2011-11-15 17:57:41 -06:00
petethegoat@gmail.com
db89732ce8 Fix for husk revival. 
(probably fixes some dna modifier runtimes which relate to husks. see: http://pastebin.com/r2PE5tvU)

Small fix for putting stuff in microwaves. Rest of the microwave code is still dicks, though.

Fixed shards always appearing in the top right corner.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2521 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-14 19:16:35 +00:00
rockdtben
faee0422ae implemented getOxyLoss() 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2520 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-14 14:44:52 +00:00
petethegoat@gmail.com
c2cfc7ef40 Hotfix for status displays. 
They are no longer dense.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2517 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-13 17:08:13 +00:00
petethegoat@gmail.com
7830c037c8 Fixed issue 194. 
Added proper atmos tech jumpsuit, engineering jumpsuit, and rad suit inhands.
Adjusted some other inhands, including a fixed yellow suit inhand.
Added vey's proper stun baton onbelt sprites.

Changed the security flavoured EOD closet to a regular one. (reasoning being that the Sec version looked terrible)
Fixed the intercom in the bar.
Adjusted EVA to be slightly less messy.

Made the welding mask toggle position on attack_self().

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2514 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-11 17:43:40 +00:00
trubblebass@gmail.com
65d2d51f0f - Fixed a typo in light-tile construction that has been annoying me. 
It should now read "You attach the wire to the glass"
Instead of "You attack the wire to the glass"

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2510 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-10 19:24:01 +00:00
petethegoat@gmail.com
882cb48f32 New look for tank dispensers. Sprites courtesy of vey. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2509 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-10 18:58:59 +00:00
trubblebass@gmail.com
5020b325f9 - Fixed Issue 202 
- Fixed Issue 198
- Changed Cultist de-conversion message to specify that you remember nothing about when you were a cultist.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2508 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-10 17:48:30 +00:00
rockdtben
c0c83b72d1 Commented out a var for later use. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2507 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-10 15:02:27 +00:00
rockdtben
c7d883a413 Fixed it now. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2506 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-10 15:01:18 +00:00
rockdtben
ff84314ce6 Added a getBruteLoss() proc to mob.dm and then replaced all calls of bruteloss with it. Except for the ones commented out. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2505 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-10 14:45:25 +00:00