Commit Graph

4186 Commits

Author SHA1 Message Date
Uristqwerty
36be326da7 This might fix Issue #1048 2012-05-18 22:27:26 -04:00
Erthilo
4406fca8c2 Merge and compile fixes, changelog too. 2012-05-19 02:39:50 +01:00
baloh.matevz
d8b1a4df83 - Copied over the additional glasses from Bay 12. Includes a pair of large sunglasses, hipster (prescription) glasses and 'jensenshades' security HUD.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3618 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-19 01:10:28 +00:00
Uristqwerty
1ce3bce266 Turns out last minute capitalization changes break compiling. 2012-05-18 20:46:29 -04:00
Erthilo
f76addd642 TG: - Removed hat storage.
Revision: r3608
Author: 	 baloh.matevz

TG: -Added missing door assemblies and associated sprites
Revision: r3609
Author: 	 ericgfw...@hotmail.com
2012-05-19 01:41:04 +01:00
Erthilo
a2503dcd30 TG: -Recipe updates for some booze in an attempt to resolve recipe conflicts. I
think I got them all, please notify if any remain.
-Corgi Techs!
-Added animation to splashy puddles.
Revision: r3604
Author: 	 d_h2...@yahoo.com
2012-05-19 01:16:34 +01:00
Uristqwerty
68edf99569 Finishing the minimap:
- Removed test verb
 - Added verbs for admins, ghosts, and AIs
 - If you open the minimap before it finishes initializing, it will try to update you with missing sections as they become available
2012-05-18 20:12:38 -04:00
cib
e31fde8c78 me_verb can now be called by someone other than the user. 2012-05-19 00:13:50 +02:00
cib
8f1be46918 Fixed a syntax error. 2012-05-18 23:38:32 +02:00
cib
ced7d810ed mend 2012-05-18 22:59:17 +02:00
baloh.matevz
1b3be12c3d - Removed hat storage.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3608 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 19:15:21 +00:00
cib
e2d5fd8de0 Fixed a bug with meme blindness. 2012-05-18 21:15:01 +02:00
cib
a740a14fd4 Fixed a runtime. 2012-05-18 19:58:13 +02:00
caelaislinn
453ffce556 added WIP birdmen, tweaked / cleaned up gas turbine gens, tweaked lockdown computers and poddoors.
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-19 03:22:42 +10:00
cib
e81316a2d4 mend 2012-05-18 19:15:02 +02:00
cib
3bf3669ffb This should enable pAIs and parasites to see emotes. 2012-05-18 18:54:26 +02:00
caelaislinn
869da0db36 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-05-19 01:19:50 +10:00
cib
5bd2508fbc Added Meme weaknesses, added more Meme verbs. 2012-05-18 16:31:40 +02:00
cib
05f3330b0c Added more meme abilities. 2012-05-18 13:46:19 +02:00
Rob Palkowski
0822991081 Grammar fix to CPR message 2012-05-18 02:44:15 -07:00
d_h2005@yahoo.com
7eadbf3460 -Recipe updates for some booze in an attempt to resolve recipe conflicts. I think I got them all, please notify if any remain.
-Corgi Techs!
-Added animation to splashy puddles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3604 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 03:19:40 +00:00
Erthilo
fa8e8decb4 Made rollerbeds collapsible. They don't fit in containers, so it's just easier to take to location. Added new sprites and sounds for cable cuffs, and new sounds for table smashy. 2012-05-18 00:56:53 +01:00
petethegoat@gmail.com
f01afc7edd Moved sinks into watercloset.dm, removed sink.dm
Sink path has changed- /obj/machinery/sink to /obj/structure/sink
/obj/machinery/sink/kitchen2 to /obj/structure/sink/kitchen
Sinks have been slightly updated, if you're wearing gloves, your hands will stay bloody underneath. Nothing drastic.

Added Cheri's puddles.

Updated showers, they actually clean now. They're pretty powerful, so I'm going to add a way to make them lethal, to ensure the washing machines still get some use.

Updated hydroponics trays, to make them work better with soil.

And a couple of map fixes, for toilets that were facing the wrong way in the prison and on the mining asteroid.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3603 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-17 23:16:46 +00:00
Erthilo
17fe0e9ac1 TG: -Individual dorms now have a button inside that bolts/unbolts the door
-Door control buttons give the user a message if they lack the access
-Virology door controls now properly restrict access
-Large beaker cost reduced to 5000u glass
-Shooooorts! They're comfy and easy to wear!
Revision: r3602
Author: 	 ericgfw...@hotmail.com
2012-05-17 22:17:02 +01:00
Erthilo
fb71890c18 TG: -Added WJohnston's scrubs to Medical Doctor lockers.
-Added two new syndicate bundles
-Reduced cost of thermals to 3 telecrystals (formerly 4)
-Singularity Beacons are now spawned from a smaller, portable device.
-CMO and QM jumpsuits made more unique.
-Updated Cargo Tech jumpsuit and sprite
-Edited Warden's jumpsuit striping to match his jacket
-Added WJohnston's CMO bio hood
-Bug fixes for Nodrak's Random button (Still not actually in. - Erthilo)

-Fixed misaligned downed sprites for HoS's coat and medical scrubs
-Reduced number of scrubs in medical lockers, randomized their colours

Revision: r3599 &  r3601
Author: 	 ericgfw...@hotmail.com
2012-05-17 22:13:44 +01:00
ericgfwong@hotmail.com
44cf5ee86d -Individual dorms now have a button inside that bolts/unbolts the door
-Door control buttons give the user a message if they lack the access
-Virology door controls now properly restrict access
-Large beaker cost reduced to 5000u glass
-Shooooorts! They're comfy and easy to wear!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3602 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-17 20:10:22 +00:00
caelaislinn
afc7e796b6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-05-18 04:10:14 +10:00
caelaislinn
3e86a24489 wip antiqua, wip birdman, conveyors push items into crates now
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-18 04:08:43 +10:00
Albert Iordache
d23513a047 Merge pull request #1085 from dopeghoti/master
Switch default UI from Old to New.
2012-05-17 02:35:22 -07:00
Albert Iordache
33f18717ad Fixed Get-Mob, #1038 2012-05-17 12:32:40 +03:00
Rob Palkowski
171d8011ac Make the new UI the default.
Seriously, does anyone even like the old UI? It's hideous.
2012-05-17 00:24:46 -07:00
SkyMarshal
eb87f26079 I removed that var a month ago! 2012-05-16 23:55:09 -07:00
SkyMarshal
b9493129cf Fixes the bullshit ERP crap form tg causing runtimes. Whoever coded that needs [REDACTED] 2012-05-16 23:47:22 -07:00
Cael Aislinn
a625c23cc3 test
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2012-05-17 16:13:03 +10:00
Erthilo
4eea62f47c Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-17 03:01:25 +01:00
Albert Iordache
a100fd78bc Bugfix for #1073 2012-05-17 00:55:38 +03:00
Erthilo
8a8006d078 Fixes and tweaks reagents to use REAGENTS_METABOLISM. So no more filling up on one sip of cola. Halves hunger rate due to our SUPER LONG ROUNDS. Also adds a deceased option for security records. Just cause! 2012-05-16 22:19:13 +01:00
Erthilo
a233c5020c Fixed MMI and AIzed AI's not getting same commands. 2012-05-16 19:35:17 +01:00
ericgfwong@hotmail.com
b54822362a -Added WJohnston's scrubs to Medical Doctor lockers.
-Added two new syndicate bundles
-Reduced cost of thermals to 3 telecrystals (formerly 4)
-Singularity Beacons are now spawned from a smaller, portable device.
-CMO and QM jumpsuits made more unique.
-Updated Cargo Tech jumpsuit and sprite
-Edited Warden's jumpsuit striping to match his jacket
-Added WJohnston's CMO bio hood
-Bug fixes for Nodrak's Random button

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3599 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-16 06:09:32 +00:00
Erthilo
7de0918d3e TG: Random button added to traitor uplinks.
- All traitor items are available in the random button so long as you have the
crystals to purchase it.
- This means it's possible (though very unlikely) to get 5 sets of revolver
ammo.
- It's RANDOM, don't expect great stuff every time.

Made startSinglo() a game-master only verb in the debug tab.
- It is incredibly useful and time saving when testing stuff out before
committing.

Added borgs, AIs and dead players to the list of protected paths in the delete
all verb.
- Unless someone can give me a valid reason as to why an admin would delete all
ghosts.
Revision: r3595
Author: 	 johnsonmt88
2012-05-15 23:53:35 +01:00
Erthilo
b2f098c39b Small fix for making cable restraints with exactly 15 lengths. Added using a wirecutter on a restrained person to quickly release them. 2012-05-15 23:31:44 +01:00
Erthilo
c6f143acfe Added some \the checks. 2012-05-15 22:52:59 +01:00
Erthilo
db3b96c0a7 Adds cable restraints that can be made from 15 lengths of coil, and fixes table grammar. Also reverts lockdown changes so it works for the Exodus for now. 2012-05-15 22:24:25 +01:00
Albert Iordache
474c6a4a4f Removed the start_vote command, because it can only have 3 buttons and no cancel option. Start it up via the voting command, now. 2012-05-15 10:07:45 +03:00
Erthilo
9d76032058 Adds logging to holodeck controls. Allows AI to toggle saferty on and off, unless emagged. Fixes mech weapons not firing. Add ADVANCED INTERROGATION TECHNIQUES (smashing peoples faces with tables). Grab someone once and then click on a table. Fixes sleep button not waking you up. 2012-05-15 03:57:56 +01:00
SkyMarshal
d7131de6dc Merge pull request #1060 from Erthilo/TGUpdates
TG Updates 3586 to 3594 + Var logging for stripping
2012-05-14 19:10:06 -07:00
johnsonmt88@gmail.com
d336b65d1b Random button added to traitor uplinks.
- All traitor items are available in the random button so long as you have the crystals to purchase it.
- This means it's possible (though very unlikely) to get 5 sets of revolver ammo.
- It's RANDOM, don't expect great stuff every time.

Made startSinglo() a game-master only verb in the debug tab.
- It is incredibly useful and time saving when testing stuff out before committing.

Added borgs, AIs and dead players to the list of protected paths in the delete all verb. 
- Unless someone can give me a valid reason as to why an admin would delete all ghosts.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3595 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-15 00:32:26 +00:00
Erthilo
51de17e8ad TG: Committing from the Proposed Commit forum:
Work by Neek
- Hulk Hogan moustache fix

Work by Yvarov
- Alien Unconciousness fix (Fixes  Issue 283 )
- - Also commented out alien snoring all over because aliens don't snore.
- Replacement light box fix (Fixes  Issue 398 )
- Syringe gun attack logs added (Fixes  Issue 465 )

Work by QualityVan
- Nettle and Death Nettle force based on potency.
Revision: r3593
Author: 	 johnsonmt88
2012-05-15 00:58:12 +01:00
Erthilo
496d6ce13b Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/defines/obj/supplypacks.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2012-05-15 00:51:50 +01:00
Hawk-v3
4c0b24e511 Merge pull request #1058 from SkyMarshal/BugFixes
Made req_access work like req_one_access used to; req_combined_access is now used for when you need more than one type of access to be checked together. Adjusted maps to reflect this.
2012-05-14 16:46:22 -07:00