cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,035 Commits 2 Branches 1 Tag
fe008599896d23dda79aad9e22e6a410c77fa407
Commit Graph

5285 Commits

Author SHA1 Message Date
CIB
fe00859989 Increased cyborg slots to two 
According to http://baystation12.net/forums/viewtopic.php?f=5&t=5144&view=unread#unread, we could even go up to 3, but let's take it one step at a time.
 2012-08-12 03:24:02 -07:00
Albert Iordache
5e2f4948d0 Revert pull request #1605 and #1606 due to temperature bugs killing the crew 2012-08-12 12:17:35 +03:00
Albert Iordache
3439b6a88f Merge pull request #1606 from SkyMarshal/master 
Some small changes before I go to bed.
 2012-08-12 01:06:03 -07:00
SkyMarshal
2ed777a53e Just committing my work before bed. 2012-08-12 01:00:40 -07:00
SkyMarshal
b37ea52f4d Some code that ensures ladders and shit play nice with the modular Z-levels 2012-08-12 00:16:14 -07:00
headswe
ad4be43ec0 Merge pull request #1605 from SkyMarshal/master 
More ZAS fixes, some work on less-retarded code for 3D processing, can be toggled with a pre-processor #define
 2012-08-11 23:55:08 -07:00
SkyMarshal
4b1f394b2b Made a whoopsie in the ladder code, now conforms to modular Z-levels. 
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
 2012-08-11 23:53:07 -07:00
SkyMarshal
0bee1cb6b5 Work on 3D stuff. 2012-08-11 23:40:28 -07:00
SkyMarshal
5140b4e906 ZAS fixes. 2012-08-11 21:22:34 -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
ac3e5b6b05 Merge pull request #1602 from SkyMarshal/master 
ZAS bugfixes and improvements. Zones will now properly interact with any bordering unsimulated turfs, so Cael can now make his planetary map.
 2012-08-11 05:54:26 -07:00
CIB
0d2c2d11df Fixes the space unbuildable bug, I hope 2012-08-11 05:45:36 -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
SkyMarshal
bccaea11c9 Some more minor improvements. 2012-08-11 01:05:14 -07:00
SkyMarshal
bca7ff054e Made an oopsie somewhere. 2012-08-11 00:56:52 -07:00
SkyMarshal
cf89bbed1b ZAS bugfixes and improvements. Zones will now properly interact with any bordering unsimulated turfs, so Cael can now make his planetary map. Some cleanup to the code, and added scaling and sanity to air movement so that stuff isn't pants on head retarded. 2012-08-11 00:50:19 -07: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
79412c9a75 Merge pull request #1588 from CIB/suit 
Moved the captain's suit
 2012-08-10 09:19:53 -07: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
5ac03a38d5 Merge pull request #1599 from caelaislinn/master 
zas debugging
 2012-08-09 19:12:41 -07:00
Cael_Aislinn
77d031b230 removed false positive, doubled zas debug sensitivity 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-10 12:11:21 +10:00
Mloc
d92887ed42 Merge pull request #1598 from caelaislinn/master 
zas debugging
 2012-08-09 18:10:19 -07:00
Cael_Aislinn
b805dce8e1 additional zas debugging 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-10 11:06:27 +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
3b9acf1c9e replaced log_admin with log_adminwarn, so hopefully the messages will output to server 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-10 01:41:17 +10:00
Cael_Aislinn
0fe99d3b6d actually make the debug messages output >.> also fixed up a couple of messages 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-10 01:24:40 +10: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
2abbd8ce6b compile fix, tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 04:53:29 +10:00
Cael_Aislinn
ab0fe32f84 additional debugging tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 04:49:18 +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
Cael_Aislinn
d817bbb490 more verbose zas debugging, decreased runtime sensitivity by half again, and reset the counter every time a tick is successful 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 03:19:50 +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
6b6d037b51 Fixed a few mistakes with captain's suit storage unit. 2012-08-07 03:01:46 -07:00
cib
8ee4280e73 Moved the captain's space suit to a secure position in EVA. 2012-08-07 02:33:30 -07: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