Commit Graph

6956 Commits

Author SHA1 Message Date
Albert Iordache
cc6c63edd7 Merge pull request #423 from caelaislinn/master
added a couple of new clothing items, updated some sprites
2012-02-16 08:29:15 -08:00
Jimapples
ecc25f0580 Added randomised barsigns, again!
Signed-off-by: Apples <chicken_face@ymail.com>
2012-02-16 15:35:21 +00:00
kortgstation@gmail.com
3a96667003 Desert Eagles now use magazines, .50AE ammo, and only have 7 shots. They're basically revolvers that use magazines.
Nuke ops lost that horribly nerfed piece of shit c20r and now get Desert Eagles and Riot Shields.

The detectives .38 ammo now does the same damage as regular revolver bullets. If he wants to keep acting as a glorified sec officer, he can go grab a taser.

The Veil Render now summons a subtype of Nar-Sie which doesn't pull anchored objects. This should reduce the power of the item/reduce lag while I get sprites and finalize details with Urist for reworking it as the Sphere of Annihilation (as in, this is temporary)

Updated the changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3132 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-16 07:20:32 +00:00
SkyMarshal
8769fdd3fc Merge pull request #432 from Tastyfish/master
ported in a bunch of the old food making stuff
2012-02-15 19:11:30 -08:00
Tastyfish
4ce36641ea Merge remote-tracking branch 'upstream/master' 2012-02-15 20:06:49 -05:00
SkyMarshal
58d7da9008 Missing blood_DNA now goes into admin logs and stuff. 2012-02-15 10:26:22 -07:00
SkyMarshal
5e332d297d Added a sanity check, added some feedback stuff to help identify WTF is happening with blood. 2012-02-14 19:58:21 -07:00
CaelAislinn
95b521dede Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-15 07:04:43 +10:00
CaelAislinn
9d798d3f95 updated some sprites, added new clothing
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-15 06:58:50 +10:00
elly1989@rocketmail.com
0a80f91f2c Added Spacevines to the random events. Added a spawn space-vines option to the secrets panel.
Fixes issue 250 (borg door bug)
Fixed silicon interactions with engineering equipment.
Fixed access lists for radiation collectors, so locking them actually serves a purpose. Fixed using crowbars on them.
Borgs can name themselves upon module selection (unless a roboticist has named them previously by using a pen)
To avoid Borgs griefing and then changing their name by selecting a module, borgs are now unable to move independently until they choose a module.
New sprites for spacevines are on the way. So you'll have to tolerate my crappy stand-ins for a bit until he is finished with them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3128 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-14 20:29:58 +00:00
SkyMarshal
7e140afe56 Added more update_clothing() calls 2012-02-14 12:12:42 -07:00
Tastyfish
badb7bd93f Merge remote-tracking branch 'upstream/master' 2012-02-14 12:01:14 -05:00
Tastyfish
12d119c109 porting old food stuff 2012-02-14 11:59:16 -05:00
quartz235@gmail.com
8619772bd8 - Using robot parts on a suit that already has that part no longer eats up the part you used on it
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3127 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-14 08:05:54 +00:00
SkyMarshal
0fe42327a5 This should hopefully reduce processing requirements, by not rebuilding icons every tick.
(Ported oldcode, all props to Strumpetplaya)
2012-02-13 21:54:22 -07:00
kortgstation@gmail.com
8caa698d48 Chaplains are no longer immune to cult magic. Instead, a new item, the null rod, spawns in the chaplains office. Having the rod on your person will make you immune to cult magic.
Runes are now dispelled with the null rod, not the bible.

Chaplains can no longer self heal with the bible.

Simple animals can now attack mechas and critters 

Constructs no longer take extra damage from bibles.

Fueltanks now explode when shot by lasers or bullets.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3125 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-14 03:29:18 +00:00
Mloc
1d4567bfc4 Merge pull request #404 from Uristqwerty/master
Three fixes for the Runtime Errors topic.
2012-02-12 12:01:06 -08:00
baloh.matevz
e5d2b7ac7b - Desk lamps are now just fancy flashlights. Which means you can pick them up. They have w_class set to 4 and don't have the onbelt flag, meaning you can't put them in any container and you can't put them in a pocket. Click on them to pick them up, use the toggle-light verb to turn them on or off. They are no longer affected by light switches (desk lights generally aren't anyway)
- Updated lamp type path on both uterus and 2.0.8

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3115 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-12 19:28:44 +00:00
Uristqwerty
8e84ff57df Three fixes for the Runtime Errors topic.
- null.check_tile_graphic() in FEA_system
- "Cancel".network in /proc/camera_network_sort
- "d699999427062f612349cb4948a6eb...".len (Might not be fixed entirely, but I fixed one place that it was being set incorrectly)
2012-02-12 13:54:52 -05:00
Tastyfish
aeafc2ffa5 can eat all foods with fork like a sane person now 2012-02-12 07:07:16 -05:00
trubblebass@gmail.com
2d95a92602 Commited on behalf of Nodrak
- Fixes: Issue 257, Issue 346 and Issue 343
- Monkeys no longer continue to take suffocation damage after dying.
- PDAs can no longer be used while stunned or paralysed.
- Vending machines now have a delay to stop product spamming.

Note: I upped the delay a little as it was still pretty spammable when I tested it, seems to be fine now as it's way more effort than it's worth to empty a vending machine.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3107 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 21:06:22 +00:00
baloh.matevz
42fa87c2b2 - Putting a normal or a gold ID card into a wallet now properly updates the sprite. The sprite that's chosen is the sprite of the card which is first in the list of items. Removing an ID from the wallet also properly updates the sprite.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3106 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 21:00:03 +00:00
baloh.matevz
37c7a57054 - Dropped support for attaching photos to ID cards. The feature was never fully implemented and the information you got from them was misleading and wrong.
- Backpacks max_combined_w_class is now 21 instead of 20, meaning it can store 7 box-sized items instead of 6 box sized items + 1 small item (which the box is supposed to hold anyway)
- Added many fire alarms around the station to areas that either lacked them or where they were too rare
- Added 4 hazard vests to the atmospherics departments for atmos techs who prefer hazard vests to firesuits.
- Added these changes to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3092 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 15:03:33 +00:00
baloh.matevz
d070a44078 - Power alarms on z level 1 now update to their proper alert level state when spawned. They now spawn with the green alert level overlay at round start.
- Removed the window/north, window/east and the other dir-specific window subclasses
- Request console global announcements no longer have the leading space
- Wrenching wooden table parts now gives wood instead of metal
- Replaced the engineering singularity viewing cameras with EMP proof cameras

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3085 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 05:37:58 +00:00
baloh.matevz
3a0a764243 Crayon boxes are now storage items. I have no idea why they weren't storage items to being with but now they are.
6 storage slots, can only hold crayons. Icon_state is properly updated when crayons are taken out as well as when crayons are put in.

Updated uterus and 2.0.8 with the new type path, which is /obj/item/weapon/storage/crayonbox

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3082 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 01:46:19 +00:00
baloh.matevz
64bcc1c0f0 - Moved three (well two, one was doubled for some reason) screen/attackby() procs to appear AFTER the screen object is defined. They were in a random file instead of where the objects are. If you double-click and 'screen' object in the object browser it now takes you to the definition instead of some random file.
- Clicking a grille with a glass or r-glass sheet in your hand, when the grille is in one of your cardinal directions (North, south, east or west) will make you start building a window. It takes 2s to build the window, which spawns unfastened (same as when you create one.) This should make fixing damaged grille-window combinations easier. If you are standing on a grille and click it with a glass / r-glass sheet in your hand, the window will face the direction you're currently facing.

Screenshot:
http://www.kamletos.si/placing%20windows%20on%20grilles.PNG

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3081 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 00:04:21 +00:00
Albert Iordache
a6f89fefee Merge pull request #398 from caelaislinn/master
new custom items
2012-02-10 14:32:38 -08:00
CaelAislinn
0edd231592 added new custom items
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-11 07:24:50 +10:00
kortgstation@gmail.com
58be707695 Added a partially constructed teleporter to the syndicate (nuclear) shuttle. It is behind a blast door operated by the same computer that opens the outer airlock to prevent the operatives from using it will still on the centcomm Z level.
A teleporter circuit board has been added to the nuke radio, and can be purchased for 20 telecrystals. This will allow them to finish the teleporter onboard their ship. This will be probably be absurdly overpowered and need to be reverted, but no harm in trying it out, right?

Moved the teleporter board out secure tech and into the RD's office. Because teleporters cannot be built from scratch, the board serves almost no purpose but to be deconstructed anyway. And having it in the RD's office will prevent nuke teams from stealing it from space to complete their machine.

Replaced the mechanical toolboxes on the nuke shuttle with syndicate toolboxes.

Updated the changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3076 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-10 07:19:27 +00:00
Tastyfish
bd6fbb5fe8 fix to sky's reagent effects changes 2012-02-10 00:07:29 -05:00
SkyMarshal
1d29574bc3 Part 2 of the WIP chemistry stuff
Map update with secure doors!
2012-02-09 21:50:50 -07:00
CaelAislinn
4021891986 missing files
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-10 09:33:48 +10:00
CaelAislinn
03f970de65 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-10 09:11:08 +10:00
SkyMarshal
8b62eff01a Cleaned up the fingerprint code
Added sanity checks to the clean blood proc.
2012-02-09 09:42:08 -07:00
petethegoat@gmail.com
e6f31fae1a Amended feedback vars from last commit.
New vars are as follows.

cyborg_frames_built
cyborg_birth
cyborg_mmis_filled
cyborg_ais_created

cyborg_standard
cyborg_service
cyborg_miner
cyborg_medical
cyborg_security
cyborg_engineering
cyborg_janitor

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3065 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 02:38:15 +00:00
petethegoat@gmail.com
24e2aedab8 Added stat tracking for cyborg frames built, cyborgs created, MMIs filled, AIs created, and cyborg modules chosen.
cyborg_frames_built
cyborgs_created
mmis_filled
ais_created

standard_cyborgs
service_cyborgs
miner_cyborgs
medical_cyborgs
security_cyborgs
engineering_cyborgs
janitor_cyborgs

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3064 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 02:27:54 +00:00
baloh.matevz@gmail.com
cd37755ff4 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3062 316c924e-a436-60f5-8080-3fe189b3f50e 2012-02-09 01:37:42 +00:00
SkyMarshal
710bcbb42b Final parts for the airlocks.
Wrench -> Weld -> Wrench removes the cover
secure/centcom has all wires electrocute
Emag is now tweaked
Implanted uplink now works.
2012-02-08 17:42:34 -07:00
SkyMarshal
1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.
2012-02-08 12:13:03 -07:00
SkyMarshal
ffb142abae Secure Airlock update!
4 new wires, completely randomised! (2nd bolt wire, 2 only-drop-bolts wires, and an AI alert wire that alerts an AI 20% of the time, when messed with)
Emags have a limited number of uses, between 3 and 7, and cost 5 TC
Hacktools are more useful than they were, and have a lower chance of alerting the AI
(This is unmapped ATM)
2012-02-08 12:07:12 -07:00
Melvin Melonstorm
f8f3f290c5 Fixed a bug with the wardrobe, changed a lot of strings and added a seal for the wardrobe, allowing people to check whether a wardrobe has been opened before or not. 2012-02-08 19:15:10 +01:00
CaelAislinn
b38922f163 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-08 18:16:09 +10:00
Albert Iordache
e96e8bc19d Moved the definitions of id cards from weapon.dm to weapons/cards_ids.dm 2012-02-08 08:10:15 +02:00
CaelAislinn
22811eaf26 added personal lockers to most departments, balanced job equipment between wardrobe closet and locker, miscellaneous tweaks (including fix to taj whisp/speak, it should work fine now except for radios)
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-08 11:47:07 +10:00
quartz235@gmail.com
d3643b021f Fixed issue 352
- Hacking wallsafes/briefcases is now properly interruptible.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3053 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-07 23:33:52 +00:00
Albert Iordache
7df0181e60 Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity 2012-02-07 20:05:43 +02:00
Albert Iordache
a20481062c Cleaned up parts of the code, no other changes 2012-02-07 20:05:42 +02:00
SkyMarshal
e432958ab5 Bugfixes for airlocks
Added detective work manual, that spawns on top of the detective's computer
Added RadioAlert proc
Added the capability to title the NanoTrasen updates
2012-02-06 20:24:00 -07:00
baloh.matevz
2cfd6a1141 cheap lighter is now not capitalized so the parser works properly.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3046 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-07 00:41:30 +00:00
SkyMarshal
1f25c49c06 MOAR BUGFIXES 2012-02-05 21:56:12 -07:00