cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-16 03:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,765 Commits 8 Branches 26 Tags
22c627901b1abfd52e52dfd8e4e71f5a4067ef67
Commit Graph

2611 Commits

Author SHA1 Message Date
cib
22c627901b Fixed a very silly mistake with wound healing. 2012-08-06 13:23:32 -07:00
cib
45a0eac4e7 Small fix to widening wounds. 2012-08-06 13:19:45 -07:00
cib
279bcc1851 Reduced blood regen significantly. 2012-08-06 13:13:40 -07:00
cib
35d82b3789 Increased the chance of wounds ripping open. 2012-08-06 13:11:48 -07:00
cib
2d751104ae Fixed an issue with wound creation 2012-08-06 13:00:43 -07:00
cib
71e3d50399 Bugfix to healing organs 2012-08-06 15:45:21 -07:00
cib
bdffd60cc9 Balanced out wound healing. 2012-08-06 15:21:03 -07:00
cib
b89e913445 Slowed down healing a little. 
Also a minor fix to examine.
 2012-08-06 15:08:29 -07:00
cib
76c06283f4 Fixed another derp with organs 2012-08-06 13:58:59 -07:00
cib
1f6231c174 Fixes some more merge issues 2012-08-06 13:48:21 -07:00
cib
f13a961a65 Merge branch 'cib' of github.com:CIB/Baystation12 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/organ/organ.dm
	code/setup.dm
 2012-08-06 13:36:26 -07:00
cib
2be19a15ba Minor bugfix to new organs. 2012-08-06 13:28:02 -07:00
cib
0c67bc7439 Restructured the organ wound system. 
Wounds are now datums rather than pure text, which means wound descriptions in examine will now always be in line with the actual damage of the mob.
 2012-08-06 12:51:18 -07:00
CIB
95ab92c0a6 Merge pull request #1510 from Abi79/master 
Minor optimization to metroid/proc/get_obstacle_ok
 2012-07-23 23:10:15 -07:00
SkyMarshal
d09d744f7f Made the adminhelps sent to the IRC lack the HTML, and made PLASMAGUARD actually work. 2012-07-23 21:32:35 -07:00
Albert Iordache
4eee0a106c Minor optimization to metroid/proc/get_obstacle_ok() and re-added Sky's beam optimization 2012-07-23 18:43:43 +03:00
Albert Iordache
cfabe7be97 Re-added deletion logging 2012-07-23 10:31:14 +03:00
Albert Iordache
188e7e3a2a Revert "Optimized the code regarding the beam projectiles leaving a fleeting beam behind them, however the count of deletions is still quite high despite this. 30-50 deletions per second." 
This reverts commit 45c8a37bd1.
 2012-07-22 23:35:38 +03:00
SkyMarshal
45c8a37bd1 Optimized the code regarding the beam projectiles leaving a fleeting beam behind them, however the count of deletions is still quite high despite this. 30-50 deletions per second. 
Also fixed the code for evidence bags.
 2012-07-20 22:04:00 -07:00
SkyMarshal
2a1404faac More rigidly defined ZAS zone structures, so that connections work without flaw and rebuilding a zone will always produce the same shape. Also readded spess carp and fixed a compilation error. 2012-07-20 12:35:42 -07:00
CIB
c219463c2c Merge pull request #1499 from Nerezza/istype 
'Streamlining' the istype procs a little.
 2012-07-20 09:43:26 -07:00
CIB
ebc6bf8897 Merge pull request #1500 from Nerezza/oxyreci 
Added Oxycodone recipe
 2012-07-20 09:42:50 -07:00
Nerezza
916b289c83 modified: code/modules/chemical/Chemistry-Recipes.dm 2012-07-20 10:40:05 -05:00
Nerezza
c840fa3698 modified: code/modules/mob/mob_helpers.dm 2012-07-20 08:53:23 -05:00
Albert Iordache
a47109950c Removed null organ debugging (no conclusive results) and broken access changing on airlocks during air alarms 2012-07-20 12:01:02 +03:00
Nerezza
c462364cf6 modified: code/modules/mob/living/silicon/robot/robot_modules.dm 2012-07-17 23:25:32 -05:00
Nerezza
253fe92b1b modified: code/modules/mob/living/silicon/ai/say.dm 
modified:   code/modules/mob/living/silicon/decoy/decoy.dm
	modified:   code/modules/mob/living/silicon/pai/say.dm
	modified:   code/modules/mob/living/silicon/robot/say.dm
	modified:   code/unused/hivebot/mainframe.dm
	modified:   code/unused/hivebot/say.dm
 2012-07-17 14:26:36 -05:00
Nerezza
3ca01536fd modified: code/modules/mob/living/carbon/brain/brain.dm 
modified:   code/modules/mob/living/silicon/ai/say.dm
	modified:   code/modules/mob/living/silicon/decoy/decoy.dm
	modified:   code/modules/mob/living/silicon/pai/say.dm
	modified:   code/modules/mob/living/silicon/robot/say.dm
	modified:   code/unused/hivebot/mainframe.dm
	modified:   code/unused/hivebot/say.dm
 2012-07-17 13:39:45 -05:00
Albert Iordache
6e143ad438 Merge pull request #1481 from Nerezza/patch-2 
Mops need a bucket to use.
 2012-07-17 00:43:15 -07:00
Mloc
abfbf289c2 Merge pull request #1479 from headswe/master 
blood regen fix.
 2012-07-16 11:35:42 -07:00
Nerezza
0587a5a265 Mops need a bucket to use. 2012-07-16 13:26:31 -05:00
Nerezza
7b14336608 The medical borg's hypo looks to be using the icon 'borghypo' from syringes.dmi which doesn't exist. I think this should fix it so medicalborgs have hypos again. 2012-07-16 12:57:35 -05:00
Albert Iordache
246a0cca2a Removed some mob/organs deletions 2012-07-16 17:13:45 +03:00
Head
966c6c079b Fixed blood regen 2012-07-16 12:31:07 +02:00
Albert Iordache
61d851d5b2 Debugging organs 2012-07-16 12:12:48 +03:00
Albert Iordache
4b350214a9 Fixed two runtimes errors (AI eye and artifacts) 2012-07-15 12:50:27 +03:00
Albert Iordache
0762b2a9eb Fixed a case where examine becomes bugged after an admin revives a player 2012-07-14 14:08:17 +03:00
Albert Iordache
b94b57e04c Partially fixed the double definition of BROKEN, renamed organ definitions 2012-07-13 23:42:05 +03:00
Albert Iordache
dd6c41ade1 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/modules/research/xenoarchaeology/artifact_effect.dm
 2012-07-13 20:58:48 +03:00
Albert Iordache
dda09390ac Merging pull request from caelaislinn-master 2012-07-13 20:54:22 +03:00
Albert Iordache
b4c7e25d94 Merge pull request #1469 from Abi79/bugfix 
Quick fix to avoid artifact runtime error spam
 2012-07-13 02:48:21 -07:00
Albert Iordache
05851aa0e4 Quick fix to avoid artifact runtime error spam 2012-07-12 15:57:53 +03:00
Albert Iordache
aab476a847 Optimized the mineral processing machine a bit 2012-07-12 15:40:13 +03:00
Albert Iordache
ff91b3d499 Added a limit of ore to the ore boxes and lowered the limit of ore for satchels 2012-07-12 15:38:53 +03:00
Albert Iordache
f5fff3d937 Re-added the limit of 10 items moved per tick, for conveyor belts 2012-07-12 15:37:22 +03:00
Albert Iordache
3059f37f9a As in human/life(), made metroid/Life() abort if stat == 2 2012-07-11 11:33:43 +03:00
Albert Iordache
f7c41f6b42 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-07-10 22:06:11 +03:00
cib
aa3a9ba062 Minor fix to bleeding. 2012-07-10 19:11:48 +02:00
Albert Iordache
d47b71b7c8 Added cancel button to teleport dialog, close button to PDA window and cancel button to telepathic mind projection 2012-07-10 16:31:19 +03:00
CIB
f083c109bf Fix issue #1449 2012-07-10 13:09:15 +03:00