Zuhayr
dec28dda86
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12
2013-08-03 12:41:46 -07:00
Zuhayr
49d53c376b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-08-03 12:39:51 -07:00
Zuhayr
27f7d1580d
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12
2013-08-02 20:16:50 -07:00
Zuhayr
37f134ec42
Corruption fix - we had way too many strings somehow.
2013-08-02 20:14:20 -07:00
Zuhayr
a470444963
TEMPORARY fix for the too-many-strings RSC corruption issue.
2013-08-03 09:21:53 -07:00
Zuhayr
618afa1be7
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-08-03 09:16:41 -07:00
Zuhayr
a8c04cefc6
Merge.
2013-08-03 09:14:20 -07:00
Segrain
cf5d3f9a2e
Variable inject amounts for sleepers.
2013-08-02 19:34:10 +03:00
Segrain
826ce1c0f1
Fixes for handling embedded objects.
2013-08-02 19:32:58 +03:00
Segrain
d51809faa2
Separating autoinjectors box from injector box.
2013-08-02 19:30:02 +03:00
Segrain
dd3a8fc568
Advanced medical equipment for NanoMeds.
2013-08-02 19:27:23 +03:00
Segrain
d21a29dc09
Runtime error fix.
2013-08-02 19:09:54 +03:00
Segrain
c2712dd9d3
Fix for #3410 .
2013-08-01 20:58:35 +03:00
Segrain
fb4552f394
Fix for #3383 . Again.
2013-08-01 17:15:16 +03:00
Segrain
2e2cca058c
Fix for #3406 .
2013-08-01 17:11:12 +03:00
Peter Wall
0bd10c628d
Fixed ore processing machines not updating properly
2013-08-01 14:42:53 +02:00
comma
95f00d0523
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks
2013-08-01 10:03:46 +04:00
comma
bbdcb81868
Added advanced medikits.
2013-08-01 09:58:09 +04:00
comma
c8f5b98a95
Autoinjectors.
...
Now they are one-use, as they were intended.
You can still change their contents with syringes before they are used.
To mitigate their one-use nature, box of them is added to medical closets and supply pack.
2013-08-01 08:12:56 +04:00
Zuhayr
b4e8c60472
Merge resolution.
2013-07-31 19:21:58 -07:00
comma
de1309102e
Splints!
...
Actually added 2 commits before, but now with full capabilities.
2013-08-01 05:58:55 +04:00
comma
b4bc37db06
Capped regen from treated wounds at 50 damage.
...
If there is a wound with more than 50 damage, it only can be healed with chems or advanced medikits (if they heal it past 50 on their use).
2013-08-01 05:57:30 +04:00
Zuhayr
8008a27ec4
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-07-31 18:54:45 -07:00
comma
8735254b87
Moved code from parent class with checks to subclasses.
...
Lots of copypaste code, but better that bloating that one main function even more IMHO.
As for bloat reason - readded advanced medithingies. Work same as lesser ones, but heal some damage directly instead, and have different messages/
2013-08-01 05:53:48 +04:00
Zuhayr
f50256eabb
Work progresses on species datums. Mass-commit due to repo issues requiring a reset.
2013-07-31 11:50:56 -07:00
Segrain
c8381b6e90
Pipe painter addition.
2013-07-31 14:23:30 +03:00
Segrain
8021250804
Type mismatch fix.
2013-07-31 10:32:19 +03:00
Segrain
bd6c5f4b30
Removing internal cameras again.
2013-07-31 05:43:23 +03:00
Chinsky
36619656b8
Merge pull request #3395 from Zuhayr/feature
...
Podman rewrite, icons. Fixes from master. ERT stuff from Meyar.
2013-07-30 14:47:55 -07:00
Zuhayr
2644684a81
Proper runtime fix for ablative armour and tasers.
2013-07-31 07:30:57 -07:00
Zuhayr
76e18b0ebe
Derp, compile fix.
2013-07-31 04:49:15 -07:00
Zuhayr
486f46d71e
Moved around podmen code, adjusted a lot of strings, rewrote/modified a lot of the podman generation code, added podman icons, commented out potato person green tint.
2013-07-31 04:17:17 -07:00
Zuhayr
361ecb4e2b
Merge resolution.
2013-07-30 17:33:18 -07:00
Kilakk
bd6b9cceeb
Removed the tcomms server for the non-existant mining channel.
2013-07-30 17:39:02 -04:00
Kilakk
e9b8269e13
Adds colored department radio channels.
2013-07-30 17:38:34 -04:00
Erthilo
89ffc92168
Fixes text errors in ghost manifest runes and newscasters with apostrophes.
2013-07-30 22:36:42 +01:00
Erthilo
d591c1ef75
Hotfix for EFTPOS and ATM machines not connecting to databases.
2013-07-30 20:26:08 +01:00
Erthilo
9bbf43407f
Fixes Gravitational Catapult not detaching.
2013-07-30 20:06:37 +01:00
Segrain
24bc26fd13
Fix for table/computer cross-detection.
2013-07-30 19:13:42 +03:00
Segrain
578a020c8b
Fix for #3392 .
2013-07-30 12:15:12 +03:00
Kilakk
3f172dcd08
Changed ERT headsets to correctly show the Supply channel
...
* ERT headsets now (correctly) show the Supply channel rather than the two non-existant Cargo/Mining channels.
2013-07-29 22:31:47 -04:00
Chinsky
27c1bced7f
Merge pull request #3385 from Zuhayr/master
...
Taser runtime fix.
2013-07-29 12:13:22 -07:00
Zuhayr
a39aff3471
Removed a very very redundant check in the ablative armour code. Thanks Segrain.
2013-07-29 12:51:20 -07:00
Zuhayr
5adc32cf8e
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-07-29 12:15:23 -07:00
Zuhayr
b1ac1d58f9
Fixes #3383
2013-07-29 12:15:04 -07:00
Zuhayr
c361e6f4b7
Commented out debug string.
2013-07-29 16:55:03 -07:00
Zuhayr
6c53208115
Taser and examine fixes.
2013-07-29 16:50:37 -07:00
Zuhayr
2d45713d69
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2013-07-29 15:47:44 -07:00
Zuhayr
27d44c0e98
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-07-29 15:43:03 -07:00
meyar
1498c5748e
Camera's got lost in the shuffle.
2013-07-29 04:34:28 -04:00
