Commit Graph

5688 Commits

Author SHA1 Message Date
Spamcat
6bd34da085 Fixes #2689. 2013-04-27 13:54:13 +04:00
Spamcat
e4763aa928 Fixed #2708. 2013-04-27 13:49:44 +04:00
Chinsky
8ce8e35d02 Merge pull request #2704 from SkyMarshal/airfixes
Made circulators and TEGs work, updated Rowtree's station with a functional powergrid and TEG battery.
2013-04-25 11:02:14 -07:00
fauxtada
48a6326747 custom items update
- Michael Guess' golden lighter
- Krinn's saucepan hat
- Writerer's cat thing
2013-04-25 00:57:55 -07:00
Asanadas
f2ce063eda Fixes a slip-up division thing. 2013-04-24 20:01:49 -04:00
SkyMarshal
3b41db4a18 Made circulators and TEGs work, updated Rowtree's station with a functional powergrid and TEG battery.
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
2013-04-24 15:58:39 -07:00
jediluke69
85eb0f1224 Adds new drinks and fixes a few things 2013-04-24 18:49:01 -04:00
Asanadas
ff229d5780 This 10x increases the size of admin-uploadable sound .ogg files and MIDI (10MB Midi, a scary thought). Should be big enough for any space assholes. Players can always opt out of uploaded music being downloaded and played with their "Hear/Silence-Midis" verb. 2013-04-24 17:55:14 -04:00
Asanadas
f03da6fb94 Spelling fix for a button only admins ever see. 2013-04-24 17:20:43 -04:00
Chinsky
1745befd08 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-04-24 21:54:00 +04:00
fauxtada
c1991ba0dd Player Requests Edition
- Two canes will spawn in medbay storage for people with leg injuries.
- Added some more welding goggles for engineers in engineering.
- Armory has a second security hardsuit.
- CMO has hallway access to the medbay hardsuits.
- HoS hat spawns in HoS closet.
- White wedding dress spawns in chaplain closet.
- Removed Pulse Rifle and Laser Canon from ERT room.
- Detective's office will now start off with a cigeratte pack and a detective's flask.
- Three normal boring flasks now spawn behind the bar for the bartender to give out.
- Old Man Suit spawns in laundry room. - Requested by Book.
- Roaper's Callum suit ( http://baystation12.net/forums/viewtopic.php?f=33&t=7047 ) now spawns in under Knockoff Suit. It may or may not spawn in for him too, I don't know how this shit works but I think I got it right.
- Removed Roaper's items for Ian Colm. At least the code part, I don't know if I'm supposed to delete the DMIs or not so I left them in.
2013-04-24 03:04:35 -07:00
Chinsky
47b28e5cce Merge pull request #2690 from fauxki/bleeding-edge-freeze
Bleeding edge freeze - Map / Clothing changes
2013-04-23 16:15:05 -07:00
Chinsky
c8b800e6d9 Merge pull request #2695 from NerdyBoy1104/bleeding-edge-freeze
Small Hydroponics update.
2013-04-23 16:12:36 -07:00
NerdyBoy1104
390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
Mordeth221
3bff68a9a2 Fixed icon_state of sven-kit to sven_kit 2013-04-23 23:11:12 +02:00
Mordeth221
76b2941803 Added custom APLU 2013-04-23 18:56:44 +01:00
fauxtada
272d7925cf Sorry, sorry!
The last commit was full of compiling errors, this fixes that one.
2013-04-22 13:29:23 -07:00
fauxtada
44a67167b3 Uniform Closet Changes
- Adjusted the items that spawn in the mixed wardrobe. Now includes:
--- Colorful shoes.
--- Plaid Skirts. Lady Power.
--- Leather shoes.
- Put dispatcher uniform in security closet for playtesting purposes.
- Nurse dress, orderly uniform, and first responder jacket now spawn in medical closet. Man that thing is full of stuff.
2013-04-21 22:50:52 -07:00
Chinsky
b6597c1310 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/modules/surgery/braincore.dm
2013-04-20 12:11:52 +04:00
SkyMarshal
0f570b5dc8 Same XenoArch computer fix as in master branch. 2013-04-19 16:34:50 -07:00
SkyMarshal
bd0d988b23 Fix for Xenoarch machines producing ludicrous amounts of heat.
Defines may need tweaked to produce the desired effect.
2013-04-19 12:40:30 -07:00
SkyMarshal
ef38bc91bf Fixed some bugs with ZAS closed connections
Sped up air equalization between zones
Fixed an issue where space tiles were not removed from the zone.
Made ZAS debug functions accessible when the mapping verbs are toggled on.
2013-04-18 12:10:20 -07:00
SkyMarshal
b0d1d47c23 Fixes lighting, backpacks getting contaminated, and bombs not working. 2013-04-18 09:58:37 -07:00
SkyMarshal
2de1809c70 Airflow now prevents doors being bumped open.
Plasma settings changed as per Cacophony
Airflow defaults changed as per Cacophony
Plasma now has an effect other than what happens when breathed. (contamination readded)
Washing machines now clean off contamination.
2013-04-18 09:57:28 -07:00
SkyMarshal
76d561f003 Activated magboots will now, definitely, prevent airflow based grieving of your personage. (Included is a possible fix for airflow opening doors by throwing you at them)
Added in code to debug ZAS tile interactions, currently in the unchecked "Debug" file.
The blasted FloodFill proc now works properly, and zones are connecting right (Should finally fix that damn part of medbay not connecting to the hallway)
Plasma can contaminate again.
The master controller and world startup code has been reworked for faster server boots.
Fixed a runtime originating from a Away Mission map trying to create objects of type "null"
2013-04-18 09:57:27 -07:00
Jupotter
e51c3ce3f0 Fix a wrong null check in posibrain
A wrong nullcheck that prevent posibrain searching for a player
2013-04-18 09:56:53 -07:00
Jupotter
ca4eb6431b Add check forposibrain without brainmob
This should never happen, but check nonetheless.
2013-04-18 09:56:53 -07:00
jupotter
edba034413 Fix posibrain not turning off if no candidate
The reset proc was checking for the presence of a brainmob, while one
was created in the constructor. It should rather check the presence of a
key
2013-04-18 09:56:52 -07:00
SkyMarshal
96cefa4397 Compile fix. 2013-04-18 09:56:52 -07:00
SkyMarshal
710e97bcc6 fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. 2013-04-18 09:56:52 -07:00
SkyMarshal
81c0c5cb6d Napalm can now be made, due to fire changes. 2013-04-18 09:56:51 -07:00
SkyMarshal
5c5b7028b0 Fire update. Should now burn out after a time, and temperature varies on a number of conditions. Fixed a runtime, and made fire work in canisters. Ingame modification of ZAS is now possible again. Firedoors now remove duplicate firedoors on the same turf. 2013-04-18 09:56:51 -07:00
Ravensdale
6316d28208 comments out suethecake's gun due to having a weapon's ban 2013-04-18 09:56:50 -07:00
Asanadas
2272fbe255 Mixing napalm is incredibly broken with ZAS / not found on our wiki because it's a "secret recipe" so I figure let's just comment it out. 2013-04-18 09:56:50 -07:00
SkyMarshal
f05b8e0083 Fixes issues:
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.
2013-04-18 09:56:49 -07:00
SkyMarshal
698e7af57c Fixes lighting, backpacks getting contaminated, and bombs not working. 2013-04-17 22:07:41 -07:00
fauxtada
3fa1314c01 Fancy Formal Wear Overhaul
- Adds female dress unforms to Captains, RD, and HoP's closets.
- Fixes up the bride's dresses so they are working when spawned.
- Fixed Wedding Branch. - five wedding dresses.
- Added Dress Branch. - twelve dresses - that's including dresses moved over from the wedding branch.
2013-04-17 22:03:38 -07:00
fauxtada
0d2598c55a Adds female swimsuits to the atheltics closet. In theory. So no more certain female players running around the beach with their titties hanging out... In theory. 2013-04-17 18:22:15 -07:00
fauxtada
98a8ebab4b Added Captain's Jacket to the Captain's Closet. Chinsky showed me how to do this, so I don't know how well it was done. 2013-04-17 17:02:48 -07:00
SkyMarshal
b3f13d4dca Airflow now prevents doors being bumped open.
Plasma settings changed as per Cacophony
Airflow defaults changed as per Cacophony
Plasma now has an effect other than what happens when breathed. (contamination readded)
Washing machines now clean off contamination.
2013-04-17 01:36:05 -07:00
SkyMarshal
8c39c0ffb0 Activated magboots will now, definitely, prevent airflow based grieving of your personage. (Included is a possible fix for airflow opening doors by throwing you at them)
Added in code to debug ZAS tile interactions, currently in the unchecked "Debug" file.
The blasted FloodFill proc now works properly, and zones are connecting right (Should finally fix that damn part of medbay not connecting to the hallway)
Plasma can contaminate again.
The master controller and world startup code has been reworked for faster server boots.
Fixed a runtime originating from a Away Mission map trying to create objects of type "null"
2013-04-17 00:45:36 -07:00
Chinsky
a265a9342b Merge pull request #2661 from adammartinez271828/bleeding-edge-freeze
Updates to sun.dm and solar.dm
2013-04-16 16:15:05 -07:00
Chinsky
8761ba6bac Merge pull request #2656 from Jupotter/master
FIx posibrain unable to be started
2013-04-15 05:47:41 -07:00
Yeti
b3c9484398 Added Superboredguy's item: Engineering Hat 2013-04-13 14:32:11 -04:00
Jupotter
614c01f238 Fix a wrong null check in posibrain
A wrong nullcheck that prevent posibrain searching for a player
2013-04-13 13:16:28 +03:00
Chinsky
3a0e432832 Merge pull request #2653 from Jupotter/master
Fix for posibrain not turning off
2013-04-13 02:20:16 -07:00
Jupotter
a8e1081d9d Add check forposibrain without brainmob
This should never happen, but check nonetheless.
2013-04-13 11:58:58 +03:00
Chinsky
73c17ceb80 Merge pull request #2652 from SkyMarshal/master
Fire fixes and improvements.  Note: May need fine tuning.
2013-04-13 01:03:31 -07:00
Yeti
4928a3aa59 Custom item: Old Camera 2013-04-12 22:40:24 -04:00
Ravensdale
9e33c868cf comments out suethecake's gun due to having a weapon's ban 2013-04-12 10:41:19 -07:00