Commit Graph

1307 Commits

Author SHA1 Message Date
Erthilo
014b91cda5 Compile fixes. 2012-05-31 15:14:53 +01:00
Erthilo
8e72965077 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi
2012-05-31 15:09:35 +01:00
SkyMarshal
2bc692ec4d Some improvements for the LiquidFood stuff. 2012-05-30 16:26:24 -07:00
Lexus Langg
04f19dea7f Added a Liquidfood dispenser, food, charge, and crate using a combo of mine and Kirby's sprite.
Fully tested, everything seems to work fine.
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
2012-05-30 15:27:00 -07:00
Mloc
fbb67b2e42 Huge commit! Standardizes var definitions in most places.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-05-29 16:26:48 +01:00
Erthilo
b409a84f2d Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2012-05-29 15:00:11 +01:00
cib
3a74270e29 Merge github.com:Baystation12/Baystation12
Conflicts:
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm
2012-05-29 13:43:20 +02:00
Albert Iordache
604f7c417d Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master
Conflicts:
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
2012-05-29 08:50:58 +03:00
SkyMarshal
12392f74dd Merge pull request #1185 from Erthilo/master
HUD changes, medic spawn items, cow sprites, water bottles, Tajaran/Soghun fixes
2012-05-28 22:13:53 -07:00
Erthilo
1e022584ac TG: -New PDAs for atmos, genetics, and chemistry
-New sprites for engineering and medsci PDAs
-Warden area renamed to Armory
Revision: r3676
Author: 	 ericgfw...@hotmail.com
2012-05-29 01:12:08 +01:00
Erthilo
112fb5433e TG: - Some runtime-prevention tweaks so that impatient coders don't just break
everything somewhere down the line.
Revision: r3665
Author: 	 baloh.matevz
2012-05-29 00:33:25 +01:00
Erthilo
7f77c0ec91 TG: - Standardized var definition for RND and radio code (possibly some other stuff)
- Removed all cases (that I saw anyway) of flags being defined by static
numbers.
Revision: r3663
Author: 	 baloh.matevz
2012-05-28 23:37:43 +01:00
Erthilo
a7dd312b3e TG: - Removed support for the ONBACK and ONBELT flags.
- Replaced them with a whole range of inventory slot flags. These now govern
whether an item can or can't be placed in a certain inventory slot. See setup.dm
for information on the flags. These flags only affect humans tho, as humans are
the only beings with an inventory to talk of.
- Standardized some gun code and some other pieces of code as I came accross
them. I hate indented variable definitions!

This commit should not bring any change whatsoever to the game from a player's
perspective.
Revision: r3659
Author: 	 baloh.matevz
2012-05-28 22:58:57 +01:00
Erthilo
e106fe4c51 Adds water bottles to vending machines. 2012-05-28 20:14:19 +01:00
SkyMarshal
7a37d9bb05 Merge pull request #1167 from Erthilo/TGUpdates
TG Updates r3648 to r3657
2012-05-28 11:52:44 -07:00
Erthilo
2cf86ef25e Changed MAX_NAME_LEN to 40. 2012-05-28 20:52:04 +02:00
Aryn
ae2bf3c17d Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-05-27 12:50:23 -06:00
cib
d096a85b9c First part of a fix for Issue #1177
- General cleanup of the update_clothing() mechanism
- Separated update_clothing() into different procs that handle the different things that need to be done(body appearance needs to be updated, clothing appearance needs to be updated, etc.)
- Made a new public interface with which one can do these things individually, so if you just want to add a wound to a mob, you don't have to rebuild the entire clothing.
2012-05-27 16:47:53 +02:00
Albert Iordache
922a7cc509 Fixed an ATM bug 2012-05-27 08:42:35 +03:00
Aryn
6f00258376 I accidentally ALL THE THINGS! But yeah, ZAS is updated. 2012-05-26 02:01:26 -06:00
Erthilo
247869324a TG: -Moved signs and status displays off of windows and onto walls
-Moved cameras out of maintenance shafts
-Clarified ambiguous defined area names
-New defined areas (and APCs) for sleeper room & engineering break room to take
a load off atmos and medbay
Revision: r3657
Author: 	 ericgfw...@hotmail.com
2012-05-26 00:18:08 +01:00
Erthilo
6e289dabfc TG: Sanitized a large number of input()s.
- Hopefully this will cut down on the server spamming/crashing escapades
happening on other servers. (This wont stop that from happening, this just makes
it less severe)
- Some of the sanitizes were probably unnecessary, but better safe then sorry.

Added MAX_NAME_LEN constant which is initialized to 26.
- Please use MAX_NAME_LEN instead of typing in 26 when cutting inputs short.
26's are annoying when they have to be changed and you have to hunt through over
a hundred files and tens of thousands of lines of code to find them all.

Moved uplink_kits.dm to code/game/objects/storage

Moved uplinks.dm to code/game/objects
- The stuff inside uplinks.dm could really be chopped up and split into separate
dm files but this will do for now.

*********************************************************
**********************Important**************************
*********************************************************
When you create code that asks the user for an input consider whether or not it
gets shown to the user through html or the like.

If it does please sanatize() or strip_html() it. Also use copytext() to cutoff
spam by using MAX_NAME_LEN and MAX_MESSAGE_LEN as the cutoff var.
Revision: r3652
Author: 	 johnsonmt88
2012-05-26 00:09:56 +01:00
Erthilo
ca62d85b83 TG: - Crew monitoring computer pup-up screen is wider.
Revision: r3651
Author: 	 baloh.matevz
2012-05-25 22:47:34 +01:00
Erthilo
c9ea8a4c3d Fix for duplicate health analysers in the NanoMed dispensers, and changelog. Also changes old hud storage boxes to solid. 2012-05-25 04:09:17 +01:00
Erthilo
a4686e9cff HUD Update
TG: - User interface updates.
Revision: r3646
Author: 	 baloh.matevz

TG: - Added a character setup option which allows you to pick between the Midnight,
Orange and Old icon sets for the user interface.
- Deleted most of the unneeded icons from screen1_Midnight.dmi Use that as the
reference for making new icon sets.
Revision: r3647
Author: 	 baloh.matevz
2012-05-23 22:58:52 +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
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
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
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
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
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
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
caelaislinn
aa67c605dc fixed lockdown computer.
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-21 02:11:47 +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
Erthilo
229fad369e Adds right-click verbs for pick up and closet open/close. 2012-05-20 00:25:05 +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
cib
bc782cb575 Merge github.com:Baystation12/Baystation12
Conflicts:
	html/changelog.html
2012-05-19 19:42:30 +02:00
cib
e57851fbaf Fixed a few bugs with meme. 2012-05-19 16:47:09 +02:00
caelaislinn
1587ad0abc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-05-19 20:00:05 +10:00
Erthilo
0cec252e5b Rearranged satchel stuff. 2012-05-19 01:58:53 +01:00
Erthilo
d538d91137 TG: - Office chairs are now unanchored and can be pulled around, even when there is
someone on them, making them the perfect prisoner transport vehicle~
- The extinguisher will now tell you when it's empty
- Office chairs and extinguishers.... OH HOW COULD I RESIST. Yes, you can have
extinguisher derby races with office chairs :)

(Shame there are currently no office chairs on the map)
Revision: r3615
Author: 	 baloh.matevz
2012-05-19 01:54:24 +01:00
Erthilo
4f0763ada4 TG: - Wallets once again spawn in the satchels in the cabinets in the dorm.
- Wallets now fit in pockets
- If you are clicking on a storage item in your pocket with an empty hand it
will return that item to your hand
Revision: r3610
Author: 	 baloh.matevz
2012-05-19 01:44:24 +01: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
caelaislinn
869da0db36 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-05-19 01:19:50 +10:00
cib
05f3330b0c Added more meme abilities. 2012-05-18 13:46:19 +02: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
Erthilo
6130ce6d4a Adds camera film which can be used to refill cameras. Added to detectives wardrobe and arts and crafts crate. Minor grammar and punctuation fixes. 2012-05-17 21:32:34 +01:00