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
15,372 Commits 2 Branches 1 Tag
7dfbcdae68042c7d2a84d3e1543c0ce06185b46c
Commit Graph

15372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zuhayr
7dfbcdae68 Switched some if(mutation) to if(sdisability) 2013-12-25 22:14:31 +10:30
Zuhayr
72727e58d5 Forgot a tilde. 2013-12-23 11:18:00 +10:30
Zuhayr
28df8b73b2 Added deactivate() for midget power. 2013-12-23 11:15:29 +10:30
Zuhayr
cc1c1e2973 Changed disability removal to bitmask operators rather than -= as per Chinsky's posts in the diff. 2013-12-23 10:36:36 +10:30
Zuhayr
ff52920fab DNA2 fixes cherrypicked from N3X15. 2013-12-23 00:06:56 +10:30
Zuhayr
d783fd5043 Manual binary merge of head icons. 2013-12-22 23:23:25 +10:30
Zuhayr
1450c964b0 Merge pull request #4098 from Zuhayr/dev-freeze 
Dev freeze
 2013-12-22 04:44:37 -08:00
Zuhayr
bda1297472 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 2013-12-22 23:13:22 +10:30
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
Zuhayr
c6e60644a2 Merge pull request #4094 from comma/master 
Fixes #4075
 2013-12-22 04:20:53 -08:00
Chinsky
0aeeff0dd4 Merge pull request #4084 from RavingManiac/dev 
Changes to the CentCom medbay and arrivals area. Cryogenic system added.
 2013-12-22 00:56:51 -08:00
DJSnapshot
fc465ab66b Merge pull request #4091 from Miniature/master 
Fixes issue #4062 (Chaplains door to coffins improperly layered)
 2013-12-21 23:54:04 -08:00
DJSnapshot
f003badf35 Merge pull request #4092 from comma/dev-freeze 
Dev freeze fixes
 2013-12-21 23:51:56 -08:00
RavingManiac
cf6d9190f3 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-12-22 13:42:02 +08:00
Chinsky
a498de8356 Fixes #4075 
Cannot turn around while unconscious or dead now.
 2013-12-22 08:49:42 +04:00
Chinsky
19c83de6af Applying Minifix to Yinaderp 
ID of resulting chemical was not set, so reagents just disappeared
 2013-12-22 07:55:03 +04:00
Chinsky
3604986aff Merge pull request #4081 from fauxki/dev 
Gentleman's Outfit for wizard.
 2013-12-21 19:45:38 -08:00
Zuhayr
dcea456684 Merge pull request #4090 from alex-gh/head_reattachment_runtime_fix 
Fixed runtime when reattaching a mindless head.
 2013-12-21 18:41:00 -08:00
alex-gh
a48100da74 Reattaching a mindless head no longer results in a runtime error 2013-12-21 22:50:13 +01:00
Miniature
77f1e9c784 Fixes issue #4062 (Chaplains door to coffins improperly layered) 2013-12-22 07:50:57 +10:30
Zuhayr
b6fed55fcd Merge pull request #4086 from Ravensdale/player_age 
Player age restriction tweak
 2013-12-21 08:06:26 -08:00
Ravensdale
9d9c797135 changes pushed to master branch instead of dev 2013-12-21 07:31:43 -08:00
Mloc
f56019c953 Merge pull request #4082 from Ravensdale/ib_fix 
IB nerf
 2013-12-21 07:20:16 -08:00
Mloc
4391bda64e Merge pull request #4083 from RavingManiac/master 
Simplified the monkey pulling check as per Giacom's suggestion.
 2013-12-21 07:19:34 -08:00
RavingManiac
72932905e5 Changes to the CentCom medbay and arrivals area. Cryogenic system added. 2013-12-21 16:11:32 +08:00
RavingManiac
b26492e66d Simplified the monkey pulling check as per Giacom's suggestion. 2013-12-21 13:51:06 +08:00
Ravensdale
95ac40a04a Re-balancing for IB, bleed rate is back to usual settings, minor nerf for 
appendicitis initial bleed rate, harder to get IB.
 2013-12-20 17:01:51 -08:00
fauxki
5550c98615 Puts the Gentlemanly Wizard outfit in the wizard wardrobe. 2013-12-20 16:59:56 -08:00
fauxki
ad41957f9d Puts in a gray flatcap for the wizard. 
Adds in a fancy long jacket for him too.
 2013-12-20 16:59:24 -08:00
fauxki
7c695eb9ba Adds in the gentleman's suit for the gentlemanly wizard. 2013-12-20 16:58:34 -08:00
fauxki
4c4aa90b7c Adds the walking cane as a useable wizard's staff. 2013-12-20 16:56:46 -08:00
Ravensdale
13fa1709b3 IB nerf: Makes it harder to get IB, makes the initial bleed less. 2013-12-20 14:03:24 -08:00
Zuhayr
bb602139b0 Merge pull request #4074 from fauxki/dev 
Centcom Update + Minor Updates
 2013-12-20 10:35:57 -08:00
Zuhayr
dfeb32ce79 Merge pull request #4070 from RavingManiac/master 
Crouching monkey, hidden mousetrap
 2013-12-20 03:43:34 -08:00
fauxki
247cae41a1 Adds in the red shoes I forgot to put into the closet that has all the colored shoes in it. 2013-12-20 01:29:13 -08:00
fauxki
05f012b486 Added in the Longer Hair that was removed in the TG merge under the new name of Flaired hair because to many hairstyles start with long. 2013-12-20 01:28:47 -08:00
fauxki
92fbda4998 Swim shoes weren't showing up because I screwed up DMI names. 2013-12-20 01:27:49 -08:00
fauxki
6784e8e668 The dress is white, not orange. 2013-12-20 01:27:11 -08:00
fauxki
10ad3edcde - removes plasma windows from rnd 
- removes additional airlock shutters from windows i missed.
 2013-12-20 00:23:07 -08:00
Asanadas
1ae17bb724 Merge pull request #4073 from Zuhayr/borertweaks 
Borer tweaks/additions. Borers for the Borer God.
 2013-12-19 18:17:44 -08:00
RavingManiac
6f067f4b4f Removed two variables accidentally copied over from dev 2013-12-19 20:39:10 +08:00
Zuhayr
5b1bc6f8da Tentative fix for #4037, unable to reproduce runtime to check. 2013-12-19 22:13:48 +10:30
fauxki
dbcb4e368d Updates Centcom level of map. Adds in a medbay, security holding area, and updates the bar and escape shuttle. Wizarding den was also edited to look more fancy. Details and images here: http://baystation12.net/forums/viewtopic.php?f=20&t=9361&p=192264#p192264 2013-12-18 18:08:44 -08:00
Zuhayr
b0b038873f Medical HUDs will now only show brainworms if the worm is controlling the host. 2013-12-19 11:00:21 +10:30
Zuhayr
44ef03e439 Prevents borers from getting through head coverage. 2013-12-19 10:38:21 +10:30
Zuhayr
11f8a5835f Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-12-19 00:01:12 +10:30
Zuhayr
f936dbda31 Possible fix for borers teleporting through windows. 2013-12-19 00:00:28 +10:30
Mloc
19d33bc2ee Merge pull request #4065 from SkyMarshal/patch-4 
Ghosts can see PDA messages.
 2013-12-18 05:26:41 -08:00
Mloc
832cdde58d Merge pull request #4068 from Zuhayr/feature 
Skrellian hardsuit helmet resprites.
 2013-12-18 05:26:08 -08:00
Mloc
7c3c2d2f85 Merge pull request #4069 from Zuhayr/master 
Bug fixes.
 2013-12-18 05:25:58 -08:00