Cael_Aislinn
b7804cc295
Merge remote-tracking branch 'remotes/Baystation12/Baystation12/bleeding-edge-freeze' into work_in_progress
2012-12-15 00:39:16 +10:00
Cael_Aislinn
d1cf168480
Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress
2012-12-15 00:39:07 +10:00
Zuhayr
f8af31bdda
Three custom items: Ana Ka'Rimah, Jane Doe, Altair An-Nasaqan.
2012-12-13 02:40:45 -08:00
cib
f664e7c99d
Fixes issue #2033
2012-12-11 12:07:11 +01:00
Cael_Aislinn
d6a1bade5b
Merge branch 'features' into work_in_progress
2012-12-11 12:39:22 +10:00
Cael_Aislinn
21c9f55654
Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress
2012-12-11 12:38:58 +10:00
Mloc
9d60a87ee4
Merge pull request #2020 from GauHelldragon/master
...
Service Borg Upgrade
2012-12-10 08:44:33 -08:00
cib
fd4a3576d4
Fix to the improved player notes list.
2012-12-09 21:00:36 +04:00
cib
c56974f2e8
Fixes issue #2043
...
Player notes list now has a better organized interface, which should prevent BYOND overloading and dying a gruesome death.
2012-12-09 16:04:43 +01:00
cib
a911d5de43
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-12-09 15:34:15 +01:00
cib
0201e83fcb
Merge branch 'master' of github.com:CIB/Baystation12
2012-12-06 15:15:25 +01:00
cib
6ab420237b
Attack log will now store type path for bullets.
2012-12-06 15:14:17 +01:00
Jim "Apples"
84bcc87e45
Merge pull request #2027 from SweeperM/master
...
Fixes to lighting
2012-12-03 03:09:02 -08:00
Cael_Aislinn
f7d41058ed
Merge branch 'work_in_progress' of github.com:caelaislinn/Baystation12 into features
2012-12-03 18:56:16 +10:00
Cael_Aislinn
39f07d50bf
Merge https://github.com/Baystation12/Baystation12 into features
2012-12-03 18:54:21 +10:00
Cael_Aislinn
cc2771d4d5
thrown facehuggers only have a 25% chance of hitting now, and they have a chance to miss when leaping normally
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-03 13:58:58 +10:00
Cael_Aislinn
ee04fd9f1e
significantly reduced alien disarm-stun time (from 10-15 seconds to 0.5-3 seconds), reduced stun chance, added a 25% chance to stun the alien, reduced alien heal rate on weeds from 5 to 1 (they still heal toxin damage at a rate of 5)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-03 13:54:29 +10:00
Cael_Aislinn
d09d7bf313
changed alien neurotoxin to bio type projectile (which means it's stopped by protective gear like biosuits), fixed a runtime
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-03 13:50:57 +10:00
Cael_Aislinn
6d1ea0548d
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into work_in_progress
...
Conflicts:
code/modules/customitems/item_defines.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-03 13:08:47 +10:00
Cael_Aislinn
d55170ab97
fixed an extra line added
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-03 01:04:14 +10:00
Chinsky
ab440fbf7d
Fixed compile error in custom items.
...
Made rigs protect against radiation again.
2012-12-01 18:35:27 +04:00
Cael_Aislinn
3b6c00eae5
made space ninja a toggleable client option
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-01 18:07:18 +10:00
Cael_Aislinn
c8f603cebd
WIP stuff for skin styles sprite accessory
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-01 18:07:02 +10:00
Cael_Aislinn
7e3f58cea2
CPR optimisations, made hypospray visible on the map
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-01 18:06:19 +10:00
Cael_Aislinn
9391d55e6e
compile fix
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-01 18:05:05 +10:00
SweeperM
b8a12b0b52
Fixes to lighting
...
-Fixed #2005 (for sure!)
-Fixed the stacking of brightness. Now the most bright item turned ON will be the one where the user gets its luminosity of.
-Cleaned the code a bit. Now only one var controls the on/off switch of light, and another holds the value of brightness when on.
2012-11-29 23:01:51 +00:00
GauHelldragon
01828f8a02
Added more comments
2012-11-29 12:21:38 -08:00
GauHelldragon
06ae2ded6f
Change - Robotray only picks up food/drinks/condiments
2012-11-29 12:10:30 -08:00
MrYeti
1c3d72e471
Added My own Custom item and Misterbook's pipe spawning in his backpack.
...
Also deleted some stuff that were requested for deletion.
2012-11-28 16:38:40 -05:00
GauHelldragon
17440ff756
Fixed blood regen bug
...
Nutriment is stored in reagents. Vessel is only for blood.
2012-11-28 12:37:27 -08:00
GauHelldragon
2c47afc22e
Roboitems - Printing Pen
...
Allows service borg to rename paper. Click on pen to toggle between writing and renaming mode.
2012-11-28 03:03:20 -08:00
GauHelldragon
09f1d74566
Fixed typo in tray description
2012-11-27 15:24:44 -08:00
GauHelldragon
5e74a9803c
Modified Service Bot's Tray to actually be useful
...
Service Borg's tray now can load and unload items.
2012-11-27 15:16:59 -08:00
MrYeti
69992184d3
Deleted the items!
2012-11-27 14:16:21 -05:00
GauHelldragon
c896fd6fcb
Added feedback messages for when service bot auto-refills their drink containers.
...
Tweaked battery charge usage for refilling, and fixed bug where it would not refill if you empty it completely.
2012-11-27 05:47:43 -08:00
MrYeti
f1b328f1fb
Finished up Roaper's Custom item
...
Now ready to push!
2012-11-26 18:55:54 -05:00
MrYeti
ded839e0f7
Added Custom Item: Monogrammed Handkerchief
2012-11-26 17:15:03 -05:00
MrYeti
fda5be14de
Added Roaper's Custom Item
...
Deleted some unwanted custom item stuff as well
2012-11-26 16:40:19 -05:00
Mloc
1923260b5e
Merge pull request #2012 from comma/master
...
Fixes for surgery
2012-11-26 08:59:20 -08:00
MrYeti
8d0ab6b56c
Added Custom Item: Etched Beaker
2012-11-24 23:28:52 -05:00
MrYeti
10b42cc1b3
Fixed my mistake,
...
Thanks to Sheep for catching it!
2012-11-24 23:01:14 -05:00
MrYeti
de83a09f50
Added Custom Item Left Hand Glove
2012-11-24 15:33:46 -05:00
MrYeti
d63b1b232e
Added Custom Item: Scanning Goggles
2012-11-24 14:22:14 -05:00
MrYeti
c92f831811
Added Engraved Zippo Lighter
2012-11-24 08:34:21 -05:00
Hawk-v3
ebc31cfeb2
Merge pull request #2002 from SniperYeti/master
...
Added Custom Item- Fountain Pen and Lithium Flask
2012-11-23 17:53:52 -08:00
Hawk-v3
74ed33360b
Merge pull request #1975 from RavingManiac/master
...
Wrapping paper fixes and improvements
2012-11-23 17:52:52 -08:00
MrYeti
314911e458
Added Custom item: Lithium Flask
2012-11-23 12:57:58 -05:00
RavingManiac
f4fe11fc4c
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-24 01:26:19 +08:00
cib
300219813d
Fix for cryo stopping bleeding.
...
Forgot that internal bleeding doesn't use drip()
2012-11-23 16:04:16 +01:00
cib
d52d0c2c88
Cryo now stops bleeding temporarily.
...
To be exact, low body temperature in general does.
2012-11-23 15:59:43 +01:00
