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
22,751 Commits 2 Branches 1 Tag
c739438c7ab8b9050f24c033b37b3d94aa2c90f0
Commit Graph

10095 Commits

Author SHA1 Message Date
Zuhayr
32813af228 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-15 22:04:07 +10:30
Zuhayr
be2b0aa6f4 Merge pull request #8135 from Baystation12/master 
Master into dev.
 2015-02-15 22:03:43 +10:30
Zuhayr
3fc9c0aec7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-15 22:03:17 +10:30
GinjaNinja32
9c68bd492d Adds current color as default to hair, facial hair, eye and skin color pickers 2015-02-14 21:49:45 +00:00
mwerezak
f54588675f Fixes soporific and chloral hydrate 
Soporific now makes people fall asleep, as intended. CH now knocks
people out after 20 seconds, instead of after 3 minutes.
 2015-02-14 13:51:10 -05:00
PsiOmega
fde03b2e94 Containers now properly checks types instead of string paths. 
Security and medical belts could contain now no longer existing objects. These types have been removed.

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
	code/game/objects/structures/inflatable.dm
	code/modules/clothing/under/ties.dm
 2015-02-14 14:16:40 +01:00
Zuhayr
d0b4f9de8a Merge branch 'xenohydro' of https://github.com/Zuhayr/Baystation12 into xenohydro 2015-02-14 23:44:01 +10:30
Zuhayr
3b7555c6e0 WIP 2015-02-14 23:43:52 +10:30
Zuhayr
77177b514f Working on spores. 2015-02-14 10:30:06 +10:30
Zuhayr
5e87b21d44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-14 09:32:17 +10:30
PsiOmega
dc1774e23b Adds missing Event cost stat. 2015-02-13 09:43:18 +01:00
Chinsky
9dd282e43b Merge pull request #8105 from PsiOmegaDelta/SyndicateDedLongLiveSyndicate 
New traitor items
 2015-02-13 08:22:28 +03:00
Zuhayr
232c2c93e2 Fixes infinite loop issues with plant controller. 2015-02-13 10:56:52 +10:30
Zuhayr
066482de93 Readds predefined ambrosia items. 2015-02-13 05:53:45 +10:30
Zuhayr
15e666150e Readded pumpkin carving and poultice making. Added a description generator and cache. 2015-02-13 05:02:21 +10:30
Zuhayr
8fb5836e4f Generalized fruit products properly. 2015-02-13 03:52:46 +10:30
PsiOmega
f8c5cf8f83 Adds a kit with cigarette packs and zippo lighter. 
Includes 2 packs of flash powder cigarettes, 2 packs of smoke creating cigarettes, 1 pack of mindbreaker cigarettes, and 1 pack of tricordrazine cigarettes.
 2015-02-12 16:35:49 +01:00
Zuhayr
a9d55a17b8 Readded mob products. 2015-02-12 23:24:44 +10:30
Zuhayr
c953e279a4 Update from dev. 2015-02-12 23:15:47 +10:30
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
Zuhayr
0955b001dc Merge pull request #8114 from mwerezak/hydrofix 
Fixes randomized seed nutrient_consumption
 2015-02-12 18:48:11 +10:30
mwerezak
5b5e16916f Replaces text expressions with macros 2015-02-12 01:55:12 -05:00
PsiOmegaDelta
d8b9b024be Merge pull request #8115 from mwerezak/powerfix 
Fixes machines being usable after a power failure
 2015-02-12 06:41:29 +01:00
Atlantiscze
4c4411259a PACMAN Generator NanoUI 
- Gives PACMAN type generators NanoUI, instead of the old UI
- Example screenshot: http://i.imgur.com/QhQEw1c.png (Red usually means it's bad. In this case, generator is operating at 10 power level, but maximal safe level is 4 (it's varedited to these values, normally it would be only 5/5). Overheats also give warnings (warning shown on screenshot is last warning which occurs approximately 20 seconds before explosion). Fuel is measured in cm3. For simplicity, 1 sheet = 1000cm3
 2015-02-12 06:09:42 +01:00
mwerezak
b7e3a14e0d Fixes machines being usable after a power failure 
Fixes machines not gaining the NOPOWER flag after a power failure
because they were turned off and had use_power set to 0.
Fixes machines not gaining the NOPOWER flag after being moved into an
area with no power.

Both bugs allowed power using machines to be used in areas with no
power.
 2015-02-11 23:28:53 -05:00
mwerezak
28f3bf739d Fixes randomized seed nutrient_consumption 
Centers the range of possible values evenly between small amount and
heavy supply.
 2015-02-11 23:06:29 -05:00
Atlantiscze
01b8873b9d Fixes PACMANs not working 2015-02-12 01:05:16 +01:00
PsiOmega
12e17e666f Minor casing fix. 
I couldn't unsee the lowercase t in sentences beginning with "\the" instead of "\The". I'm sorry..
 2015-02-11 19:53:08 +01:00
PsiOmega
73bc5934d5 Replaces uplink Donk-pockets with Sin-Pockets. 
Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.

Makes the concealed cane use non-del methods.
 2015-02-11 09:55:50 +01:00
Zuhayr
e6eab3fabf Adding more plant genes to play with. 2015-02-11 15:04:59 +10:30
Zuhayr
08b26e8e4c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-11 14:35:58 +10:30
PsiOmega
3a6c4dacd6 Adds 9mm gun with silencer, 5TC, with the option to acquire additional ammo, 2TC. 2015-02-10 22:39:40 +01:00
PsiOmega
0daf1c2539 Merge remote-tracking branch 'upstream/dev' into SyndicateDedLongLiveSyndicate 2015-02-10 21:32:45 +01:00
PsiOmega
d0a59bcd03 Adds a health section in the uplink. 
Box of donk-pockets for 1 TC.
Combat medical kit, containing bicardine, dermaline, dexalin plus, dylovene, tramadol, and spaceacillin, for 5 TC.
 2015-02-10 21:29:29 +01:00
Chinsky
d1de94c70e Merge pull request #8082 from Kelenius/ofMachinesAndParts 
Update for machine upgrades and some science
 2015-02-10 23:24:19 +03:00
PsiOmega
02dc9e3008 Lightly boosts the clerical kit. 
Adds destination tagger, wrapping paper, hand labeler, and the ability to select pen color.
 2015-02-10 20:12:32 +01:00
Chinsky
712b952985 Merge pull request #8089 from GinjaNinja32/pai 
NanoUI pAI, more modular pAI software
 2015-02-10 10:05:20 +03:00
Chinsky
4f1afb3747 Merge pull request #8098 from MrSnapwalk/TheseArmsWereMadeForClamping 
[Ready for Merge] Custom Item Update/Addition
 2015-02-10 09:23:47 +03:00
Chinsky
ec6278f028 Merge pull request #8097 from mwerezak/projectile-fix 
Fixes errors introduced by merge
 2015-02-10 09:23:09 +03:00
PsiOmegaDelta
79aacd9f30 Merge pull request #8081 from comma/maximumtrinkets 
Accessories update.
 2015-02-10 06:51:30 +01:00
PsiOmegaDelta
973bc1c0f3 Merge pull request #8071 from RKF45/newpaint 
Generic Paint II: Fun with Paint
 2015-02-10 06:48:32 +01:00
MrSnapwalk
05f14ccd84 Updates /obj/item/clothing/under/fluff/parkereliza and adds /obj/item/clothing/suit/fluff/parkereliza to the code. 2015-02-09 19:34:43 -06:00
mwerezak
d8a8384c41 Fixes errors introduced by merge 
Fixes errors introduced by commit
fac32d07e9.

Grabbed the version of projectile.dm from the parent commit and changed
the paths by hand (again).
 2015-02-09 17:53:47 -05:00
Chinsky
1c4734c4e3 Merge pull request #8088 from Raptor1628/dev 
Paramedic Job Fixed
 2015-02-10 01:00:08 +03:00
Chinsky
4deeebfe3e Merge pull request #8093 from GinjaNinja32/pai_pulling 
Fixes pAIs being spammed with "You are too small to pull that." when being pulled
 2015-02-09 19:52:32 +03:00
GinjaNinja32
503eb679cc Fixes pAIs being spammed with "You are too small to pull that." when being pulled 2015-02-09 13:32:42 +00:00
GinjaNinja32
42bd4e7fba Storage accessory w_class raised to 3, typo fix 2015-02-09 11:15:19 +00:00
GinjaNinja32
70094884ff Fixes, code cleanup, adds the messenger I forgot last night 2015-02-09 10:41:08 +00:00
GinjaNinja32
538ee11cb1 pAI rework 2015-02-09 01:58:54 +00:00
Raptor1628
76f4001cc1 Paramedic Job Fixed 
Adds Paramedic job as outlined on the forums. Reduces MD access to EVA,
adds some minor EMT clothing stuff, and fixes #8020 and the medgreen
armband while I was piddling around in sprites.
EMT alt title and indent fixed.

Now less broken.

![](http://i.imgur.com/vOSoJy0.png)
 2015-02-08 17:23:02 -05:00