Commit Graph

32025 Commits

Author SHA1 Message Date
Schnayy
e1b370fddb Merge pull request #8289 from MistakeNot4892/siffet
:siffet:
2021-09-11 11:45:02 -05:00
FenodyreeAv
f8a8f9e477 Fixes Colony Director's Armour (#8287)
* Fixes Colony Director's Armor

The CD's armour inherits from clothing/suit/armor/ instead of /clothing/spacesuits, like everything else in this file, so it lost it's space protection when the SPACEPROOF tag got removed.

* Removes Atmosphere
2021-09-11 11:40:11 -05:00
MistakeNot4892
3aa824ee3d siffet 2021-09-11 02:11:18 +10:00
Schnayy
7121ae2383 Merge pull request #8283 from Cerebulon/StimulantSensitivity
Stimulant allergen for Tajaran
2021-09-10 10:13:13 -05:00
Atermonera
2146cd5398 Merge pull request #8281 from Cerebulon/misc-fixes-sept
Misc runtime fixes
2021-09-09 16:07:08 -08:00
Schnayy
ead8649e98 Merge pull request #8280 from GhostActual/ushanka
Ushankas
2021-09-09 19:00:10 -05:00
Cerebulon
a04e44433d helpful warning labels 2021-09-06 23:04:11 +01:00
Cerebulon
450e81132d Bar vendor cola bottle 2021-09-06 23:00:41 +01:00
Cerebulon
3b7cdc591f Stimulant allergen for Tajaran 2021-09-06 22:51:18 +01:00
Cerebulon
41b51e55f7 Misc runtime fixes 2021-09-06 19:40:48 +01:00
MistakeNot4892
48337a1d46 Merge pull request #8275 from GhostActual/PCU_update
PCU Update
2021-09-06 13:28:51 +10:00
MistakeNot4892
3ab6620fc1 Merge pull request #8272 from lbnesquik/Kot-material-rings-loadout
Expands the ring selection
2021-09-06 13:28:43 +10:00
klaasjared
d26b0be4e4 Base Commit 2021-09-05 01:37:06 -04:00
Schnayy
5c27b9cfc4 Adjusts vatborn ages (#8273)
* Adjusts vatborn ages

* drops max to 90
2021-09-04 16:02:00 -09:00
MistakeNot4892
b9be329d35 Merge pull request #8263 from Schnayy/newborgsprite
Adds new borg sprites
2021-09-04 22:20:59 +10:00
MistakeNot4892
32aa849592 Merge pull request #8266 from lbnesquik/Kot-research-material-costs-mech
Converts pretty much all of the mech fab and pros_fab designs to mat defines instead of the other...String thing?
2021-09-04 22:20:45 +10:00
lbnesquik
5a695d7ab7 Removes phoron rings from the loadout 2021-09-04 11:28:33 +02:00
klaasjared
fda9deb8eb Small Addition 2021-09-03 23:57:20 -04:00
klaasjared
4506582aa7 Base Commit 2021-09-03 23:50:04 -04:00
MistakeNot4892
46994bc0f4 Merge pull request #8247 from Cerebulon/throwmode
Throw Mode QoL Tweaks
2021-09-03 15:36:57 +10:00
MistakeNot4892
82d6963433 Merge pull request #8271 from lbnesquik/Kot-Gold-coins
Give all coins a material amount, so you can recycle them
2021-09-03 15:35:26 +10:00
MistakeNot4892
66b68e5302 Merge pull request #8274 from lbnesquik/Kot-polarsi-barista-sugar
Gives the baristas sugar in their dispenser
2021-09-03 15:34:20 +10:00
MistakeNot4892
c5e295041b Merge pull request #8252 from lbnesquik/Kot-material-costs
Expands the material values of certain items.
2021-09-03 12:19:29 +10:00
MistakeNot4892
f14907cdb9 Merge pull request #8203 from Cerebulon/food2021
Food Expansion
2021-09-03 11:55:26 +10:00
lbnesquik
c501391a22 Adds a base matter cost to mech weapons and equipment. (#8265)
* Adds a base matter cost to mech weapons and equipment.

* Matter not materials
2021-09-03 11:53:25 +10:00
Atermonera
5a261195ea Refactors crafting to support requirement alternatives (#8184)
* Refactors crafting to support requirement alternatives
Adds recipe for spears

* adds lint

* Tweaks recipe processing
2021-09-02 16:51:41 -09:00
MistakeNot4892
02e3395d9a Merge pull request #8267 from lbnesquik/Kot-power-cells
Removes an empty file. No clue what's the deal with this.
2021-09-03 11:51:11 +10:00
lbnesquik
f6fa98997c Gives the baristas sugar in their dispenser 2021-09-02 09:02:50 +02:00
lbnesquik
6f2f7c281e Fixes double define of tin 2021-09-02 08:58:19 +02:00
lbnesquik
6df060c7cb Adds a couple more extra rings. 2021-09-02 08:41:01 +02:00
lbnesquik
bc1ad2dd65 Converts ring/material to the defines, add some extra rings. 2021-09-02 08:39:52 +02:00
lbnesquik
a94744bd99 Add phoron rings to the loadout. Sorts the rings in the code a bit because it is prettier like this. 2021-09-02 08:05:33 +02:00
lbnesquik
aff59e45a3 Give all coins a material amount, so you can recycle them into better objects. 2021-09-02 07:26:59 +02:00
lbnesquik
ad9af28fdf Removes an empty file. No clue what's the deal with this. 2021-09-01 04:56:03 +02:00
MistakeNot4892
80cce5e84c Merge pull request #8245 from Cerebulon/outdoorsprites
New dirt and paved sidewalk sprites
2021-09-01 12:24:03 +10:00
lbnesquik
202d7492fd Converts pretty much all of the mech fab and pros_fab designs to use mat defines instead of the other...String thing? 2021-09-01 04:13:27 +02:00
Cerebulon
b8c75ab047 entire duplicate sidewalk dm?! 2021-09-01 01:59:24 +01:00
Cerebulon
8b9a8d136f qdel check re-added 2021-09-01 01:54:51 +01:00
Cerebulon
71d0689435 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into swimlock 2021-09-01 01:46:41 +01:00
MistakeNot4892
007c93288b Merge pull request #8246 from Cerebulon/randomloot
Random Spawner Stuff
2021-09-01 10:27:47 +10:00
MistakeNot4892
069add820d Merge pull request #8248 from Cerebulon/howling-moon
Adds discord button to UI + config
2021-09-01 10:26:13 +10:00
MistakeNot4892
ad811cafe7 Merge pull request #8249 from Cerebulon/cubalibre
A Hint Of Lime
2021-09-01 10:25:48 +10:00
MistakeNot4892
6425be0fa8 Merge pull request #8260 from Cerebulon/clothes-aug2021
Adds a Whole Buncha More Clothes
2021-09-01 10:04:13 +10:00
MistakeNot4892
15c0a432bc Merge pull request #8261 from Cerebulon/skrellfix
Fixes skrell being excluded from skrell hair
2021-09-01 09:55:58 +10:00
MistakeNot4892
1f49c28853 Merge pull request #8262 from Cerebulon/AllergenTweak
Allergy severity tweaks
2021-09-01 09:55:41 +10:00
lbnesquik
0810f6d51a Converts things to different material names 2021-09-01 01:05:47 +02:00
Cerebulon
81229b1fab requested changes, missing reagent, generic cubes 2021-08-31 20:08:01 +01:00
Schnayy
33bd687137 adds pneuma and tower borg sprites 2021-08-31 12:39:47 -05:00
Cerebulon
a567381931 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into food2021 2021-08-31 18:31:58 +01:00
MistakeNot4892
c87c3c8ad9 Merge pull request #8195 from Cerebulon/skyratmisc
Misc. Skyrat Sprites Port
2021-08-31 22:07:56 +10:00