cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 07:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,058 Commits 2 Branches 1 Tag
aa43ad116c4e48d2bc051ad44c53001fb4331448
Commit Graph

2721 Commits

Author SHA1 Message Date
SkyMarshal
0cca49a92f Should fix singularity maybe crashing from eating signs. 2012-08-14 16:40:21 -07:00
CIB
031677a515 Merge pull request #1601 from caelaislinn/master 
various WIP xenoarch update, some runtime and crash fixes
 2012-08-11 06:00:35 -07:00
CIB
e94a508e78 Fixed a runtime 2012-08-11 05:23:22 -07:00
Cael_Aislinn
7423ec7831 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-08-11 20:28:14 +10:00
Cael_Aislinn
c5d598596e moved reagents and recipes purely used for xenoarch to a new file, forgot to commit some icons, tweaks to a bunch of xenoarch stuff 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 20:27:30 +10:00
Cael_Aislinn
782510645a tweaks to the bunsen burner, added a grinder (automated mortar and pestle) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 20:25:54 +10:00
Cael_Aislinn
b72e96c08d modified chemical reactions to preserve reagent data across reagents, if it exists. also made possible reactions with multiple products 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 20:24:51 +10:00
Cael_Aislinn
f33ee15700 fixed up some singularity ignores 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 12:44:11 +10:00
CIB
c375935846 Nerfed damage from touching light bulbs 2012-08-10 12:00:40 -07:00
Cael_Aislinn
6ded63b850 various potential runtime / crash fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 03:11:45 +10:00
Cael_Aislinn
626c782ff2 new xenoarchaeology tools, basic datum for xenoarch work (WIP stuff) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 02:37:01 +10:00
headswe
8103abcd9f Merge pull request #1583 from CIB/cib 
Full wound system rewrite - Tested and ready to merge
 2012-08-10 09:18:28 -07:00
Cael_Aislinn
c6cef3ea98 moved and tweaked the xenoarch finds a bit 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 02:17:07 +10:00
Cael_Aislinn
1bd9e86b84 added chemistry cooker (bunsen burner) and the capacity for recipes that require heating 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 02:16:04 +10:00
Mloc
43b255f867 Made adminhelps go to the moderator channel. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-08-09 21:43:45 +01:00
Cael_Aislinn
dca3f3bd8a reworked/verbosified some zas debugging, added additional zas debugging, made kill_air available to game_admins as well as game_masters, increased runtime check sensitivity to aid in debugging 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 18:12:59 +10:00
Cael_Aislinn
15fa23331b custom id cards should be able to access atms 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 14:51:59 +10:00
Cael_Aislinn
9307b00513 tweaks to simple_animal emotes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 04:42:44 +10:00
Cael_Aislinn
34000482c7 additional zas debugging, kill_air output made a bit more informative 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 04:42:26 +10:00
Cael_Aislinn
06f223ec6a ghosts properly retain their human names 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 03:29:20 +10:00
Mloc
0d94175887 Merge pull request #1585 from comma/master 
Surgery fixes and tweaks
 2012-08-08 06:44:45 -07:00
comma
138e41dd54 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm

Did not do a pull in ages, all constants I sued in surgery code got renamed.
 2012-08-08 13:21:47 +04:00
Cael_Aislinn
e4600a8fa7 tweaks / fixes to carp a bit, removes munchkin from tgstation.dmm 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-07 21:23:55 +10:00
cib
c6054e06ec Fixed a derp with damage types. 2012-08-07 00:18:53 -07:00
cib
5785c817f8 Added a few hacks to make wound processing happen less often. 2012-08-07 00:01:40 -07:00
cib
2a993ffee4 Adjusted healing speed for the amount of wounds per wound object. 2012-08-06 23:26:26 -07:00
cib
8a2a1b58ca Two fixes to joint wounds. 2012-08-06 23:17:07 -07:00
cib
7bbc98e9da Wounds of the same type are now handled in the same object. 2012-08-06 23:04:47 -07:00
cib
bf82cc0023 Healed wounds now disappear after a while. 2012-08-06 22:55:14 -07:00
cib
cc2aaf1731 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/life.dm
 2012-08-06 15:18:27 -07:00
cib
5b342bd217 A few last balance fixes to wounds. 2012-08-06 14:52:27 -07:00
cib
02457fc55b Fixed up bloodloss a bit more. 2012-08-06 14:21:34 -07:00
CIB
791e481d6e Removed a lagtastrous item 2012-08-06 14:12:04 -07:00
cib
b4f1c4ed9f Fixed yet another derp with organs 2012-08-06 14:01:36 -07:00
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
comma
fe41c6ea1e Stops processing metroid's life after it's dead. 
Fixes issue #1463

Signed-off-by: comma <krauchinsky@gmail.com>
 2012-08-06 21:11:58 +04:00
comma
c9785bbeff Cannot weld strange rocks with unlit welder anymore. 
Fixes issue #1454
 2012-08-06 19:34:59 +04:00
Cael_Aislinn
f52eb099f7 tweaks, fixes and additions to carp and simple_animals 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-07 00:03:56 +10:00