Commit Graph

3030 Commits

Author SHA1 Message Date
Albert Iordache
ca09b7774c Merge pull request #1410 from comma/master
Small things
2012-07-03 02:38:51 -07:00
CIB
124b27d2e8 Merge pull request #1424 from Drieden/master
Fixed the supply depot for good this time.
2012-07-01 20:06:43 -07:00
CIB
04fe3dedd6 Bugfix: It was impossible to flag admin reports as handled. 2012-06-30 23:59:54 +03:00
Drieden
c59c35397b Some supply depot improvements and bug fixes. 2012-06-30 09:45:37 -04:00
unknown
b0cb325bb6 Fixed a derp 2012-06-30 14:16:04 +03:00
unknown
427d409113 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-06-30 13:43:08 +03:00
Erthilo
a2ed0517e4 Reverts job numbers to default. Added spawn points to map. 2012-06-29 19:13:45 +01:00
Drieden
7a92faa3e9 Fixed a typo. 2012-06-29 04:56:18 -04:00
CIB
4065470e00 Merge pull request #1415 from Erthilo/master
Bugfixes 2: Electric Boogaloo
2012-06-28 22:15:39 -07:00
Erthilo
0e6c0cfac4 Fixed and improved body scanner, fixed derpy airlock cycling on the map. 2012-06-29 03:28:58 +01:00
Erthilo
991e11b30d Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-29 02:56:59 +01:00
Erthilo
f5b221bb63 Fixes a few places where if statements wouldn't work due to syntax errors. 2012-06-29 02:31:46 +01:00
Erthilo
95bae4da54 Fixes AI holopad speech not being picked up by tape recorders. 2012-06-28 22:33:07 +01:00
Erthilo
73e2b5f5c2 Hotfix for stun batons harming on all non-help intents. 2012-06-28 22:31:16 +01:00
Erthilo
f694e99abb Hotfix for Exosuit Fabricators not syncing. 2012-06-28 22:30:38 +01:00
Erthilo
ae63e9ec9f Mind Transfer now requires wizard garb. 2012-06-28 19:56:20 +01:00
Rob Palkowski
479705ae60 Response to server probe no longer always gives a null host name. 2012-06-28 10:51:39 -07:00
headswe
7f3f456207 Merge pull request #1411 from Erthilo/master
Fixes + Whitelist Update
2012-06-28 04:16:22 -07:00
Erthilo
4f6ec49558 Fix wallet not being made by the biogenerator. 2012-06-28 01:54:09 +01:00
Erthilo
34e4ba4750 Only chairs with wheels now work with fire extingusihers. 2012-06-28 00:01:58 +01:00
Erthilo
73ba4c7f0f Readjusted Medical items heal caps. 2012-06-27 23:36:38 +01:00
Erthilo
0c1e3f3cc4 Fixes PDA's being unusable when buckled but not handcuffed. 2012-06-27 23:36:18 +01:00
Erthilo
e37049eee1 Fixes Tajaran spawning as humans. 2012-06-27 22:21:39 +01:00
Erthilo
740bf13cec Changes mech part weight from 20 to 5. 2012-06-27 21:25:33 +01:00
unknown
869a82a3e3 Clipboards changes
+Added 'Rename' function
+Added ability to add photos to clipboards

%Fixed linebreaks not being replaced with <br> when viewing paper from clipboard

Signed-off-by: Chinsky <comma@nano.(none)>
2012-06-27 23:12:09 +03:00
Erthilo
e65b1739be Fixes surgery in general. 2012-06-27 18:08:56 +01:00
unknown
30322cae04 Made briefcase spawn empty.
Breifcases are mostly used for storing things other than paper, and that includes tedious process of getting all this paper out somewhere.
All briefcase-wielding jobs have clipboards at their disposal for storing paper, and if they need more paper, i'ts not hard to find on station.
2012-06-27 17:37:16 +03:00
Drieden
5d6f88caa0 Added a raw materials depot to the cargo bay and its associated sprite. 2012-06-26 23:26:11 -04:00
Erthilo
2ba8581267 Fixes gauze/ointment not being applied to wounds. 2012-06-26 20:36:16 +01:00
unknown
5565c466e7 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-06-26 21:46:03 +03:00
Melvin Melonstorm
754a244073 Added a medbay (with rolling beds) and a holding cell to the destination of the escape shuttle.
Some minor typo fixes.
2012-06-25 20:58:01 +02:00
Erthilo
390782f544 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-25 01:20:08 +01: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
Albert Iordache
156f1349c2 Fixed compilation error and moved acid_act() 2012-06-24 19:13:51 +03:00
SkyMarshal
e6aae0103c Merge pull request #1383 from Drieden/master
Prevented genetics from scanning headless people
2012-06-23 21:53:25 -07:00
CompactNinja
9e2629a8c6 Merge pull request #1384 from SkyMarshal/BugFixes
Final parts of ZAS.  Works like a charm now.
2012-06-23 21:23:19 -07:00
SkyMarshal
e0edc29acf Final parts of ZAS. Works like a charm now. 2012-06-23 21:20:39 -07:00
Drieden
778f40e469 Prevented genetics from scanning headless people and permanently breaking the cloner. 2012-06-23 23:42:24 -04:00
CIB
2ef4379765 Merge pull request #1381 from CIB/master
Bugfix
2012-06-23 18:24:10 -07:00
cib
b3b35ebfef Fixed bug with calling the air master. 2012-06-23 18:22:07 -07:00
Erthilo
0f8cf93095 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-24 01:53:10 +01:00
Erthilo
527110e8b0 Fixes being able to use PDA's that are on other people. 2012-06-24 01:23:29 +01:00
Erthilo
85f75e639c Fixes morph and appearance editing not updating sprites. 2012-06-24 01:12:16 +01:00
Erthilo
f137b4a880 Should fix some weird issues with electropacks and screwdrivers. 2012-06-24 01:10:32 +01:00
Erthilo
3882ac24e7 Fixes Syndicate's not spawning with explosive implants properly. 2012-06-24 01:06:11 +01:00
SkyMarshal
3efa1d4e6b More fixes. 2012-06-23 17:00:28 -07:00
SkyMarshal
62c3d1d11d De-retarded wound system. 2012-06-23 16:35:58 -07:00
SkyMarshal
ce7db3f15e Merge pull request #1374 from Erthilo/TGUpdates
TG Updates r3778 to r3752
2012-06-23 15:24:12 -07:00
Erthilo
00b4a234c4 Merge fixes. 2012-06-23 22:17:59 +01:00
Erthilo
3df776b082 TG: - Added a parser to adminhelps. When someone sends an adminhelp it looks through
the words for mob names, keys and ckeys. These are then displayed in bold and
black with a (?) next to them. Clicking the questionmark will display additional
information about the mob.

Screenshot:
http://www.kamletos.si/Adminhelp%20parser%206.PNG
Revision: r3778
Author: 	 baloh.matevz
2012-06-23 17:36:02 +01:00