cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,819 Commits 5 Branches 0 Tags
2f001078b1cc1d92d68a081dcd515ae2ecfc71f5
Commit Graph

4387 Commits

Author SHA1 Message Date
Lexus Langg
47cc90ca1a Added empty lockboxes and secure briefcases to the R&D Designs. 
Was suggested here: http://baystation12.net/forums/index.php/topic,3287.msg84734.html#msg84734
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
 2012-05-22 12:32:07 -07:00
Lexus Langg
ab92639ef4 Changed my custom item's sprites. 
I made a new mob sprite for my clipboard, and changed the flask to Kirby's sprite.
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
 2012-05-22 09:47:35 -07:00
cib
615871b0ce Merge github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2012-05-22 14:50:00 +02:00
cib
79e2cdef86 Updated changelog. Added some bug info to places in the code. 2012-05-22 14:29:01 +02:00
cib
fda676435e Added a specific sleep message, memes now see their points on the status screen, admin-adding a meme now adds them to the meme list. 2012-05-22 13:55:00 +02:00
cib
d887d8ae41 Fixed a few issues with the meme admin stuff. 2012-05-22 13:13:01 +02:00
cib
56b178f396 Implemented #1107. 2012-05-22 11:24:42 +02:00
Erthilo
edb09ea6d7 Fixes double barrel shotgun not working with the gun system. 2012-05-22 00:39:57 +01:00
Erthilo
160baf3754 Fixes police tape being placed through windows. 2012-05-22 00:16:31 +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
3f50c37609 Fixes Odysseus buckled mob bug. 2012-05-21 23:50:27 +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
SkyMarshal
f4f0b77fc8 Merge pull request #1123 from Erthilo/master 
Implant removal surgery, damp rag changes
 2012-05-21 13:03:28 -07: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
03dc270006 TG: Fix for dragging HUD elements into lockers. 
Revision: r3635
Author: 	 petethegoat
 2012-05-21 20:42:15 +01:00
Erthilo
552fe3040e TG: - Fixed the bug where a belt which spawned on you would not display it's 
contents until dropped.
Revision: r3634
Author: 	 baloh.matevz
 2012-05-21 20:40: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
Uristqwerty
45bde63206 Temp 2012-05-21 13:29:27 -04:00
Erthilo
7894a7e0ef TG: - PDA messaging reworked a bit. If you receive a message with your PDA somewhere 
on your person (so not in a backpack), the message will be displayed to you in
the text box along with the name and rank of the sender. A reply button will be
next to this to make replying easier. The PDA beep will still appear and the PDA
must not be in silent mode for this to work.

Screenshot:
http://www.kamletos.si/PDA%20communication%203.PNG

Added this to the changelog.

Revision: r3628
Author: 	 baloh.matevz

-Added confirmation prompt when calling the shuttle as an AI
-Glass airlocks no longer super-silent

Revision: r3629
Author: 	 ericgfw...@hotmail.com
 2012-05-21 17:20:23 +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
286599fb73 TG: -Minor update to job list (used in HoP computer) 
Revision: r3626
Author: 	 ericgfw...@hotmail.com
 2012-05-21 17:00:47 +01:00
Erthilo
0d8521a25e Revert "Turns control_freak on. No idea if this'll work though." 
This reverts commit 7c4a49af59.
 2012-05-21 16:55:42 +01:00
Erthilo
7c4a49af59 Turns control_freak on. No idea if this'll work though. 2012-05-21 15:40:11 +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
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
caelaislinn
98c0cfeb22 probably fixed merge conflict, also updated Antiqua.dmm 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-21 17:44:01 +10: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
SkyMarshal
0cebc4d1f2 Merge pull request #1116 from SkyMarshal/BugFixes 
Fixes Tajaran Transformation.  Few sanity checks and bugfixes added.
 2012-05-20 12:43:30 -07:00
Erthilo
f20e61b4ae Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-20 20:33:44 +01:00
SkyMarshal
69b6926293 Fixes Tajaran Transformation. Few sanity checks and bugfixes added. 2012-05-20 12:32:00 -07: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
CIB
932d60d438 Merge pull request #1115 from CIB/master 
Disable meme voting
 2012-05-20 11:50:30 -07:00
cib
cb02054845 Disable meme voting for now. 2012-05-20 20:43:10 +02:00
caelaislinn
aa67c605dc fixed lockdown computer. 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-21 02:11:47 +10:00
CIB
17372eab8e Merge pull request #1111 from caelaislinn/da65f852b6595afe6ece0400cb2d6e8c4d4da326 
antiqua updates, numerous misc changes
 2012-05-20 07:16:32 -07:00
caelaislinn
79cb750130 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/WorkInProgress/AI_Visibility/_old_AI_Visibility.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-20 22:28:18 +10:00
caelaislinn
4ffbf02569 lowered radsuits from 4 to 1 per crate 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-20 22:26:01 +10: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
caelaislinn
2c2bc1729d - tweaked heatshield, then removed it because of derp. 
- added some new engineering areas, worked on antiqua engineering (antiqua is now ready for - wiring).

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-20 22:16:00 +10:00