Commit Graph

741 Commits

Author SHA1 Message Date
Cael_Aislinn
c87bb36e90 missing icon file
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 00:15:37 +10:00
Cael_Aislinn
d2d808231e automated anti-meteor missile battery, dme changes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-03 14:58:51 +10:00
Cael_Aislinn
469a8bb601 ported over the majority of /tg's simple_animal code and changed a lot of things for simple_animals and critters
- added bears, mice (cats will chase mice, mice squeak occasionally)
- removed some unique simple_animals (ian and runtime will be the only ones for now)
- structure improvements, tweaks and cleanup for simple_animals and critters
- space carp should work fine now
2012-08-02 03:22:44 +10:00
CIB
e9937050aa Merge pull request #1558 from FireFishie/closets
Some minor changes, mostly related to wardrobes and fluff text
2012-08-01 00:23:05 -07:00
FireFishie
60c962ebb8 Clipboard added to the head of personnel's wardrobes and starting items. If the quartermaster has a clipboard on him and in his wardrobe bag, then his boss should too. 2012-07-31 04:36:32 -04:00
FireFishie
eac1335607 Added the warden jacket and pepperspray to the warden's wardrobe, and added fingerless gloves to the cargo technician and shaft miner wardrobes.
The janitor spawns with a portalathe but doesn't have one in his wardrobe, so this adds that. If the librarian gets a barcode scanner in his, then the janitor's should include the portalathe.

The captain has taken a few lessons from the head of security! When joining, the captain will now start with matching gloves, a pair of jackboots, and the more sensible captain's cap. The old Napoleonic hat is still available in the captain's closet, and both the closets and wardrobes were updated to reflect this change.

The quartermaster started with brown shoes, but only had black ones available in his wardrobes. This change should make his starting equipment more consistent.

The head of personnel should no longer be so paranoid, and now spawns without wearing body armor or a helmet. Additionally, the body armor and helmet from the wardrobe closet and bag were removed. A gun, helmet, and body armor are still available in the secure locker for emergencies.

The breath mask inside the engineer box included with the ERT backpack looked terrible when worn with the ERT helmet, yet was required if any of the team were operating near a breach or anything. This change only returns the removed SWAT mask (which leaves the helmet sprite intact) to the response team's basic equipment.

Both the secure closet and the wardrobe bag have the medsci headset in it, and the chemist lab is conjoined with research, so why shouldn't the chemist start with that headset? This commit also moves the chemist to Medical on the roster because that's where the job shows up everywhere else.
2012-07-31 01:21:44 -04:00
Fire
daaa21eabd Flashkirby99's tajaran
Kirby's kitties are now chopped up and ready for action with their
hairstyles added to the face file. Also tidied up the south human female
chest and torso to be more consistent with both their other directions
and the male's.
2012-07-30 03:27:03 -04:00
Cael_Aislinn
bd4ce09264 remove debug output
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-28 17:27:27 +10:00
Cael_Aislinn
1d002bb361 additional tweaks to r-ust
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-28 17:19:17 +10:00
Cael_Aislinn
c9b4fdbaef tweaks to shield generators, added shield generator to the admin shuttle (would have added it to other shuttles, but most are too small)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-28 13:15:02 +10:00
Cael_Aislinn
0e6939de85 multiple R-UST tweaks and slight updates. this should fix any (all?) known outstanding bugs. i also modified values to be a bit more gameplay sensible (max average output on standard operating levels is ~150-200k per gen)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-27 02:04:44 +10:00
Nerezza
6a4510cd7d modified: code/WorkInProgress/Cael_Aislinn/Tajara/say.dm 2012-07-17 15:10:57 -05:00
Nerezza
2023ecae52 Update Tara-patch1 2012-07-17 13:46:55 -05:00
Nerezza
d9d6903446 Update Tara-patch1 2012-07-17 13:43:18 -05:00
Albert Iordache
246a0cca2a Removed some mob/organs deletions 2012-07-16 17:13:45 +03:00
Albert Iordache
b94b57e04c Partially fixed the double definition of BROKEN, renamed organ definitions 2012-07-13 23:42:05 +03:00
unknown
a491ca0883 Fixed tape quirks
Sprites having non-transparent background and tape being placed 'diagonaly' even though user gets message that it could not be
2012-07-09 20:03:29 +03:00
caelaislinn
062635f3da tweaks and fixes for shielding, relating to building and useability
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-06 11:51:47 +10:00
caelaislinn
613c9457ed shielding circuitboards should be buildable now
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-06 11:17:58 +10:00
caelaislinn
9d6f45e806 shield capacitors can now be rotated correctly
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-05 23:43:43 +10:00
unknown
5565c466e7 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-06-26 21:46:03 +03:00
Erthilo
67c5e8e3a8 Medical System Updates...
* Dragging someone while injured (brute) will have a small chance of injuring them further that increases depending on how damaged they are. This coincides with the blood spatters that are already generated.
* Blood is now actually lost from the person being dragged.

* Added splints that can be applied to broken arms and legs, and will reduce effects of broken limbs. These can be removed the same way as handcuffs. They show up on the mob and on examine.
* Added an autoinjector that can only hold five units, but acts like a hypospray.
* Added an advanced medical kit that Medical Doctors spawn with that has Advanced Trauma Kits, Advanced Burn Kits, autoinjectors, and splints.
* Health Scanners now show unsplinted fractures ONLY in arms or legs.

* People in critical (less than -50 health) from external trauma (100+ damage from brute and/or burn) bleeding, and with unsplinted limbs, will send a message to anyone trying to drag them, to warn them it would be a bad idea trying to move them. They will suffer a lot more damage if dragged while lying down.
* The correct procedure is therefore, A) Bring a roller bed, or B) Splint all limbs, stop all bleeding with gauze, and then drag them.

* Fixed CPR being performed at weird health levels.
2012-06-25 01:18:55 +01:00
SkyMarshal
62c3d1d11d De-retarded wound system. 2012-06-23 16:35:58 -07:00
Erthilo
e379715ce6 TG: - Department radio keys are now a global list and no longer a list that gets
created every single time 'say :X' is used
- You can no longer whisper when stung by a changeling or had another thing make
your 'silent' var get set.
- Added a single empty toolbelt to robotics, added a wrench and screwdriver to
toxins.
- Power cells now always spawn full. The double use of the 'charge' variable was
not good, as when creating the map it had a value of 0 - 100 to represent the
percentage of the cell's power, while it was used as a numeric representation of
the amper-hours that were still left in the cell. The problem this caused was
that cells created mid-round (cells which spawned in closets or were spawned by
admins) always started empty. They all start fully charged now. Additional
obj/item/weapon/cell/X/empty types were added if we want empty cells.
Revision: r3763
Author: 	 baloh.matevz
2012-06-23 15:36:53 +01:00
SkyMarshal
668f81c329 Some tweaks and fixes for UL and any while loops I find, as well as removing generally bad procs. 2012-06-22 12:50:45 -07:00
caelaislinn
0e21ed125a artifacts can be harvested and reused in a portable emitter, restructured artifacts, artifact analyses should go a lot smoother and faster now, additional bugfixes in general, moves some icons around to hopefully fix some bugs, additional strange rock formations should spawn now, dbs should work now, reworked the anomaly lab, redacted
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 04:16:09 +10:00
SkyMarshal
9418a1c8a6 Traitor objective system update. 2012-06-21 17:51:06 -07:00
SkyMarshal
730461840f UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun) 2012-06-21 13:35:34 -07:00
SkyMarshal
5ea83f0abe Air alarm fixes, final part. Added in area atmos lockdown, proper overrides from the atmos control computer, cycling airlocks, and minor airflow/ZAS tweaks. 2012-06-21 02:06:05 -07:00
SkyMarshal
c2163b1f20 Atmos Alarms now work awesome. 2012-06-21 02:05:33 -07:00
SkyMarshal
5ac37c7a78 Final parts of the air alarm rewrite. 2012-06-21 02:05:33 -07:00
SkyMarshal
f953f78d73 WIP air alarms 2012-06-21 02:05:32 -07:00
SkyMarshal
61124c86a8 Reduction of number of ul_Illuminate and ul_Extinguish calls. (@Miniature) Also fixed a bug with the SMES room lighting. 2012-06-20 09:34:17 -07:00
SkyMarshal
abe222afde Fixed botpathing. Some fixes/changes to glows. Made lights less piss yellow. 2012-06-19 20:52:01 -07:00
SkyMarshal
c07776de73 Ultralight, but Botpathing is still retardedly broke. 2012-06-19 19:36:53 -07:00
SkyMarshal
c3d7371ccf Lots of fixes. 2012-06-19 00:24:10 -07:00
SkyMarshal
e1d91d5eaf Fixes some bugginess with UL. 2012-06-18 19:57:49 -07:00
SkyMarshal
692fdc724e Second part of UltraLight. Some fixed up fire stuff. 2012-06-18 17:52:40 -07:00
SkyMarshal
aeb850fef0 Working UL 2012-06-18 15:02:34 -07:00
caelaislinn
0e1bcfc981 minor updates
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-18 22:41:00 +10:00
caelaislinn
25752d58cd more redacted updates
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-17 20:46:49 +10:00
caelaislinn
d4e25997db fix for an unsimulated turf bug
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-17 20:42:28 +10:00
caelaislinn
e8d1a3b2ff Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-17 02:27:10 +10:00
caelaislinn
657ac7ab7b [redacted]
(I've fully tested it, it works nicely)

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-17 02:24:37 +10:00
Miniature
2898b6813b Added a thing to give a message to admins when a tile is stepped on, requested by Hawk.
To use, spawn a /obj/effect/admin_log_trap on whatever tile you want to have a message, then whenever anyone steps on that tile a message will sent to all admins, like explosions.

Feel free to move it out of my WIP folder if you want.
2012-06-16 22:28:47 +09:30
caelaislinn
f1782ec017 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/WorkInProgress/Cael_Aislinn/energy_field.dm
	code/WorkInProgress/Cael_Aislinn/external_shield_gen.dm
	code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-16 12:02:29 +10:00
caelaislinn
fc1ef5e4d2 adding reverted files
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-16 11:42:33 +10:00
caelaislinn
5dff5ccc43 adding missing shield files
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-16 11:34:39 +10:00
Hawk-v3
e68a32c173 Revert All of Cael_Aislinn's stuff from the last day, committed by Cib.
Reason: Compile Error, hung server. Damnit Cael.
2012-06-15 22:33:18 +01:00
caelaislinn
7b65a50436 dme changes
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-15 01:17:23 +10:00