cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-21 07:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,995 Commits 6 Branches 0 Tags
a24b637de561c876eea97cb15cc77d9c75dbbe25
Commit Graph

4186 Commits

Author SHA1 Message Date
Erthilo
edb09ea6d7 Fixes double barrel shotgun not working with the gun system. 2012-05-22 00:39:57 +01:00
Erthilo
b7b33fc91a /obj/item/weapon/spacecash change to /obj/item/weapon/money 
Can now split and stack money properly.

Fixes genetics/research access door and also money path changes.
 2012-05-21 23:56:48 +01:00
Erthilo
36b0ba73cd Fixes Particle Accelerator admin logging. 2012-05-21 23:55:00 +01:00
Erthilo
262890f593 Fixes armored trenchcoat name. Now that's minor! 2012-05-21 23:53:05 +01:00
Erthilo
c9bfde5d7a Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 
Conflicts:
	html/changelog.html
 2012-05-21 21:13:32 +01:00
Erthilo
dd5ed6a1cd Adds a sounds for implant removal, and better messages for the rag. 2012-05-21 21:02:01 +01:00
Erthilo
4114e246ee Merge fixes, and spelling corrections. 2012-05-21 20:47:55 +01:00
Erthilo
7fd99c7d3a TG: -Bunch of new/updated locker sprites. Most noticeable in mining and engineering 
-New wardrobe closets for several departments
Revision: r3633
Author: 	 ericgfw...@hotmail.com
 2012-05-21 20:40:08 +01:00
Erthilo
89aa2d0a90 TG: - Fixed some odd behavior with storage items when you drag-dropped them from the 
floor without ever picking them up.
- New hotkeys: Delete is the 'stop dragging' button and insert cycles through
intents.
- Added some user feedback messages to the drop, throw, stop-dragging and cycle-
intents hotkeys.
- Added the hotkeys thing to the changelog.
Revision: r3631
Author: 	 baloh.matevz
 2012-05-21 20:31:53 +01:00
Erthilo
c84aa96cc4 TG: The new 'sleek' user interface is going live. 
OLD screenshots (Actual hud uses black/orange scheme):
Humans:
http://www.kamletos.si/ss13%20hud%2018%20human%20standard.png
http://www.kamletos.si/ss13%20hud%2018%20human%20full.png

Borgs:
http://www.kamletos.si/ss13%20hud%2018%20borg.png

Aliens:
http://www.kamletos.si/ss13%20hud%2018%20larva.png
http://www.kamletos.si/ss13%20hud%2018%20alien.png

Monkeys:
http://www.kamletos.si/ss13%20hud%2018%20monkey.png
Revision: r3630
Author: 	 baloh.matevz
 2012-05-21 20:29:35 +01:00
Erthilo
911cd7fca7 TG: -Added some positive reagents to certain foods. 
Revision: r3627
Author: 	 d_h2...@yahoo.com
 2012-05-21 17:13:29 +01:00
Erthilo
4bda83ec51 Implant removal surgery. Scalpel > Hemostat > Restractor > Hemostat (Multiple times may be needed). For now syndicate implants simply disintegrate. Other implants can be put back into an implanter. 
Also allows rag to hold 5 reagents, smother people with it, and also stops it causing attack messages.
 2012-05-21 15:13:15 +01:00
Erthilo
3c1d50232a Fixes workaround if someone has a savefile and is taken off the alien whitelist. 2012-05-21 14:23:32 +01:00
ericgfwong@hotmail.com
b6a70eab34 -Bunch of new/updated locker sprites. Most noticeable in mining and engineering 
-New wardrobe closets for several departments
-Showers now have soap. Don't drop it!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3633 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-05-21 11:54:51 +00:00
Erthilo
d8a2e17f3a Hotfix for Tajarans. Reverts tajaran.dm. Guess blend doesn't work there. Also prevent skin change workaround. 2012-05-21 12:31:33 +01:00
caelaislinn
b626812c83 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/machinery/computer/lockdown.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-21 17:48:12 +10:00
baloh.matevz@gmail.com
88888ed5ab - Fixed some odd behavior with storage items when you drag-dropped them from the floor without ever picking them up. 
- New hotkeys: Delete is the 'stop dragging' button and insert cycles through intents.
- Added some user feedback messages to the drop, throw, stop-dragging and cycle-intents hotkeys.
- Added the hotkeys thing to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3631 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-05-21 00:50:13 +00:00
baloh.matevz@gmail.com
3394098496 The new 'sleek' user interface is going live. 
Screenshots:
Humans:
http://www.kamletos.si/ss13%20hud%2018%20human%20standard.png
http://www.kamletos.si/ss13%20hud%2018%20human%20full.png

Borgs:
http://www.kamletos.si/ss13%20hud%2018%20borg.png

Aliens:
http://www.kamletos.si/ss13%20hud%2018%20larva.png
http://www.kamletos.si/ss13%20hud%2018%20alien.png

Monkeys:
http://www.kamletos.si/ss13%20hud%2018%20monkey.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3630 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-05-21 00:04:08 +00:00
Erthilo
eb599dd33a Merge pull request #1119 from SkyMarshal/BugFixes 
Bug fixes
 2012-05-20 14:42:30 -07:00
SkyMarshal
58570a0f65 As many bugfixes as I could cram into here. 2012-05-20 14:23:10 -07:00
SkyMarshal
c8faf93e9f More Tajaran fixes, made blood-type damage not affect changelings, blood now regenerates. 2012-05-20 13:38:20 -07:00
Erthilo
f81b043787 Fixes for forcing no hair/face hair. Shuffles checks around for Pick Up Verb. 2012-05-20 21:37:10 +01:00
Erthilo
56db1fdff8 Adds Soghun/Tajaran whitelisting. Stick key and race into alienwhitelist.txt like so 'byondguy - Soghun' to allow soghun, etc. 2012-05-20 20:51:38 +01:00
Erthilo
f20e61b4ae Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-20 20:33:44 +01:00
Erthilo
56203680d9 Missed a list of AI verbs. Engineering jumpsuit whitespace eliminated. Half fixes holopads. You can use them, you can't move. Nutriment made less ridiculously healing. Player Mute OOC name change to be more clear. More AI camera fix. Small Tajaran examine text fix. 2012-05-20 20:09:23 +01:00
caelaislinn
aa67c605dc fixed lockdown computer. 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-21 02:11:47 +10:00
d_h2005@yahoo.com
f77c11ea92 In response to the feedback on nutrition: 
-Snack machine amounts lowered from 10 each to 6 each, which should still be more than enough.
-Normalized nutriment amounts. Many of the values had were quite inflated...
-Added some positive reagents to certain foods. Most notably, brainburgers and braincakes heal brain damage.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3627 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-05-20 15:56:03 +00:00
caelaislinn
da65f852b6 - power monitor: a remote monitoring device to send network data to a console 
- lowered the number of radsuits per crate down to 1 (they're never used on exodus anyway)
- tweaked turbines

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-20 22:18:26 +10:00
Erthilo
2ce24412ed Lot's of grammar and spelling fixes for APC actions. 2012-05-20 00:55:38 +01:00
Erthilo
9d6eb534a7 Adds confirmation to Delete Character Slot. 2012-05-19 23:01:56 +01:00
Erthilo
3582f9cb44 Normalizes AI and MMI vers, credit to @sunfall. 
Original Commit Message:
For... whatever reason, these two lists of verbs were being maintained
seperately.  @Erthilo over at BS12 made them match, but I decided to
go one further and split them out into a global list, so it only has
to be changed in a single location.

My attempt to make that list a const showed me that lists cannot
ever be const.  Which was the only reason we were still potentially
dragging around code/var/const.dm, so I nuke that here as well.

BYOND.  Sigh.
 2012-05-19 23:00:28 +01:00
Erthilo
0d84438eda Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 2012-05-19 21:16:21 +01:00
cib
d23da5e149 Fixed a bug with meme target selection. 2012-05-19 21:01:01 +02:00
Erthilo
7b3ec1bdfb TG: - Added a middleclick function that swaps your hands. 
- Some reorganization of DNA display in DNA modifiers. It's much easier to see
where blocks start and end now.
- Tried to clean up some mob stuff, mostly dead humans unnecessarily grabbing
their atmosphere.
- Made turret controls emaggeable.

I've also committed Invisty's new ending station animations. They're pretty
cool, check them out!
Revision: r3621
Author: 	 vageyenaman
 2012-05-19 19:29:13 +01:00
vageyenaman@gmail.com
5db40033a2 Bugfix for a compile error in life.dm 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3622 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-05-19 18:22:34 +00:00
cib
548bcee177 Fixed a bug where you could still whisper when meme-muted. Improved agony a bit. 2012-05-19 20:11:14 +02:00
cib
bc782cb575 Merge github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2012-05-19 19:42:30 +02:00
cib
2693d7af71 Another attempt to fix the HUD bug. 2012-05-19 19:38:02 +02:00
Erthilo
38c928ed85 TG: - Copied over the additional glasses from Bay 12. Includes a pair of large 
sunglasses, hipster (prescription) glasses and 'jensenshades' security HUD.
Revision: r3618
Author: 	 baloh.matevz
 2012-05-19 18:30:46 +01:00
cib
a571bffe8c Some bugfixes for meme. 2012-05-19 19:08:40 +02:00
vageyenaman@gmail.com
7b6a5e8c1f - Added a middleclick function that swaps your hands. 
- Some reorganization of DNA display in DNA modifiers. It's much easier to see where blocks start and end now.
- Tried to clean up some mob stuff, mostly dead humans unnecessarily grabbing their atmosphere.
- Made turret controls emaggeable.

I've also committed Invisty's new ending station animations. They're pretty cool, check them out!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3621 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-05-19 17:05:55 +00:00
cib
84d78fd2f0 Fixed a bug with possession. 2012-05-19 17:52:18 +02:00
cib
e57851fbaf Fixed a few bugs with meme. 2012-05-19 16:47:09 +02:00
cib
b941e407d1 Started work on the meme gamemode itself. 2012-05-19 14:42:41 +02:00
cib
19449f77b0 Started work on the meme gamemode itself. 2012-05-19 14:38:52 +02:00
caelaislinn
1587ad0abc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-05-19 20:00:05 +10:00
cib
736738dbb4 Fixed bug with meme death. 2012-05-19 11:36:04 +02:00
CIB
165ddcb414 Merge pull request #1096 from Uristqwerty/Minimap 
Minimap
 2012-05-19 02:07:26 -07:00
CIB
11045b71bb Merge pull request #1097 from Erthilo/TGUpdates 
TG Updates r3603 to r3615
 2012-05-19 02:03:09 -07:00
Uristqwerty
b6e4da901a Things are more complicated than they seemed at first... 
... but I think I got it.

Also fixed (hopefully) a number of other AI viewing bugs.
 2012-05-19 02:23:37 -04:00