cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 08:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,123 Commits 26 Branches 2 Tags
f5f43253ff05aa4cb124166df863c146d8d177a9
Commit Graph

18601 Commits

Author SHA1 Message Date
variableundefined
f5f43253ff Merge pull request #10213 from Dave-TH/internal_bleeding 
Internal Bleeding Rework
 2018-11-15 10:40:41 +08:00
KasparoVy
bf5f894b9d Corrects Datum Name for Consistency 2018-11-13 22:55:25 -05:00
Dave
de22c1a380 Vomit Rate Change 2018-11-13 22:53:51 -05:00
KasparoVy
074b799c81 Fixes Vulpkanin Earfluff 
Earfluff and Vulpine Fluff respectively.

The icon states in the vulp file had their names the wrong way around and there was a missing datum entry in the vulp facial hair file for regular old ear fluff.
 2018-11-13 22:41:34 -05:00
Dave
83ed5a8b4e Internal Bleeding Rework 2018-11-13 17:54:09 -05:00
variableundefined
4711732caa Merge pull request #10210 from Dave-TH/deck_fix 
Card Deck Fix
 2018-11-13 13:02:25 +08:00
Unknown
28405c7c2d Card Deck Fix 2018-11-12 23:24:52 -05:00
variableundefined
9a29dbf9f2 Merge pull request #10198 from farie82/apply-repair-logic 
Applies repairing time to mining bots
 2018-11-12 18:13:46 +08:00
Crazy Lemon
8597adba1b Merge pull request #10089 from variableundefined/SplitSpriteAccessories 
[READY] Refactor & Split up the sprite_accessories, body_accessories& human_face files
 2018-11-11 21:23:34 -08:00
tigercat2000
d037ceca6d Merge pull request #10186 from variableundefined/AddAlienScreen 
Enables the alien screen for AI
 2018-11-11 16:51:25 -08:00
variableundefined
a675406ebc Merge pull request #10194 from CornMyCob/pda-painter-wrench 
Makes a few more machines movable
 2018-11-12 08:44:05 +08:00
variableundefined
557540974f Merge pull request #10192 from farie82/Mining-bot-shoot 
Mining bots KA blasts now do weakened damage in pressured zones
 2018-11-12 08:41:45 +08:00
AzuleUtama
8ad25400ea Fixes description text errors in booger cocktail and in feral cat grenade 
Slightly changed text of booger cocktail's description to stop it creating a hyperlink in the chat window that went nowhere.  Updated feral cat grenades stating they spawned 8 cats in the uplink and item description when they actually spawn 5.
 2018-11-11 19:13:53 +00:00
variableundefined
a56e98b7b0 Merge pull request #10182 from Mitchs98/larvanerf 
Lowers Larva Move-Speed
 2018-11-11 19:17:09 +08:00
Mitchell
731cd6d2b7 Removes Pulling change/Properly fixes move speed 2018-11-11 04:12:15 -06:00
joep van der velden
4150d645c9 makes you harm mining bots with welders on anything but help 2018-11-11 10:55:32 +01:00
joep van der velden
7028e77b08 Applies repairing time to mining bots 2018-11-11 10:47:24 +01:00
variableundefined
7d470338a7 Merge pull request #10180 from Squirgenheimer/xenosinxenos 
hatching alien embryos now use drop_location
 2018-11-11 15:08:22 +08:00
variableundefined
e4904edab7 Fixes merge conflicts 2018-11-11 12:23:02 +08:00
variableundefined
ef7a4d9629 Split sprite accessories apart 
Part two, unathi refactor missing a single file

Unathi refactor

I hate unathi now

Rename icon_state of unathi & ipc to become more clear and remove unnecessary info

Improve icon_state naming on multiple files, finish up IPC & Vox refactor

Separate grey tattoo into its own file

Separate vulp facial hair, body markings and tail markings

Fek

Adds in missing file in dme

Vulpkanin sprite renaming missing vulpine facial earfluffs

Rename vulpkanin facial hair and fixes them.

Tajaran facial hair split

Finish the PR basically

Final bit of renaming and re-arranging

Fixes for three bugs noticed in game

Rename some misnamed vulpkanin icons fixing them.

Fix missing vulp head markings
 2018-11-11 12:11:57 +08:00
variableundefined
6105639f69 Merge pull request #10166 from tigercat2000/updateicons 
/tg/ human update_icons & ear organs
 2018-11-11 12:09:30 +08:00
tigercat2000
02281c826f Merge pull request #10177 from farie82/boxes 
Added new box sprites props to Shazbot for the sprites
 2018-11-10 12:43:29 -08:00
tigercat2000
ac48f3a9b5 Merge pull request #10176 from dovydas12345/Cutting 
Allows grown food to be sliced
 2018-11-10 12:42:08 -08:00
CornMyCob
44b8cdcd45 Adds a lot of other machines 2018-11-10 19:22:23 +00:00
joep van der velden
bf2325ee94 Mining bots KA blasts now do weakened damage in pressured zones 2018-11-10 18:51:12 +01:00
variableundefined
987a451005 Enables the alien screen for AI 2018-11-10 19:44:49 +08:00
joep van der velden
202ba8b5ed Forgot ERT, moved the boxes to boxes.dm 2018-11-10 12:08:06 +01:00
dovydas12345
adf12c87fa Requested changes 2018-11-10 12:17:27 +02:00
variableundefined
1eefe3f83d Merge pull request #10164 from Citinited/infinite-metal-exploit 
Fixes an infinite metal exploit
 2018-11-10 11:44:04 +08:00
Mitchell
1cd6e63b5e Lowers Movespeed, Removes ability to drag. 2018-11-09 20:54:44 -06:00
Citinited
b07af660ed Lowers min metal return from autolathe to 500, reverts cost of foam darts to 500, 2018-11-09 23:18:54 +00:00
dovydas12345
6444a5fa3f The correct check 2018-11-09 23:00:17 +02:00
dovydas12345
c552335bd9 Removes the unneeded check 2018-11-09 20:55:57 +02:00
joep van der velden
172102a51a Added new box sprites 
Props to Shazbot for the sprites
 2018-11-09 19:33:35 +01:00
dovydas12345
832a53e10d Slicing grown snacks 2018-11-09 19:54:41 +02:00
variableundefined
a03d0323ed Merge pull request #10046 from warior4356/Drill 
Thermal Drill
 2018-11-09 17:11:36 +08:00
tigercat2000
1ac542a936 Fix ghosts 2018-11-08 21:45:25 -08:00
tigercat2000
db6e93c72c Remove catgirls 2018-11-08 20:58:04 -08:00
tigercat2000
e5d1ecb6a4 Merge remote-tracking branch 'upstream/master' into updateicons 2018-11-08 20:24:48 -08:00
tigercat2000
ab032b6737 SSoverlays for human icons, mostly works 
Closer to working 100%

But legitimately /tg/ icons

Move lighting to it's own plane, fix observers

Fix humans layering over other objects incorrectly

Nyaaaaa~
 2018-11-08 20:24:22 -08:00
Citinited
83173b1077 Ghosts and other anchored mobs can no longer speed up conveyors 2018-11-09 00:35:33 +00:00
variableundefined
3ac1bb0cc2 Merge pull request #10160 from Dave-TH/space_transition 
Gives Space a Name
 2018-11-09 07:41:50 +08:00
Citinited
8eb598c38c Fixes infinite metal exploit 2018-11-08 22:45:37 +00:00
Unknown
9c06d5ce82 We now name space 2018-11-08 14:01:11 -05:00
warior4356
9be0a83269 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill 2018-11-08 01:58:53 -08:00
tigercat2000
97461b3f3d Merge pull request #10078 from variableundefined/FermentationBarrel 
[READY] Port Fel's fermentation barrel from tg
 2018-11-07 23:09:08 -08:00
variableundefined
a4812dd4e7 Update fermenting_barrel.dm 2018-11-08 14:57:56 +08:00
tigercat2000
a38cab96fe Merge pull request #10076 from variableundefined/Addcards 
Add baycards to maps, loadouts & prize.
 2018-11-07 22:53:29 -08:00
variableundefined
3cd1256bdc Merge pull request #10142 from datlo/ttvbomb 
Adds the toxins payload casing to crafting
 2018-11-08 14:18:19 +08:00
variableundefined
3c40e55658 Merge pull request #10115 from Citinited/intensive-conveyor-unit 
Makes conveyors less greedy
 2018-11-08 14:12:14 +08:00