cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 01:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

17085 Commits

Author SHA1 Message Date
Mark van Alphen
d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
 2019-05-03 18:30:07 +02:00
variableundefined
8928210da1 Merge pull request #11425 from Arkatos1/delay 
Examine tooltips tweaks
 2019-05-03 22:48:15 +08:00
variableundefined
8a5c4350bc Merge pull request #11431 from Arkatos1/plushies 
Adds 4 new plushies
 2019-05-03 22:42:49 +08:00
variableundefined
44d9f853cb Merge pull request #11418 from Arkatos1/patchpack 
Craftable Patch Pack
 2019-05-03 22:39:26 +08:00
variableundefined
f8d53aed67 Merge pull request #11426 from Arkatos1/toolbelt 
Belt Update
 2019-05-03 22:39:04 +08:00
variableundefined
01127dc5e9 Merge pull request #11429 from Mitchs98/pigcrate 
Adds Pig Crate to Cargo
 2019-05-03 22:19:50 +08:00
variableundefined
b2c3c0c4f4 Merge pull request #11443 from Kyep/attackby_runtime 
Fixes item_attack runtime when punching windoor
 2019-05-03 22:14:18 +08:00
variableundefined
6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
Kyep
cddb0a8213 one level deeper 2019-05-02 21:32:30 -07:00
Kyep
4480f28abb revert atoms_movable update 2019-05-02 21:13:22 -07:00
Kyep
33dc5697b9 fixes throw_at runtime in vendors 2019-05-02 19:20:14 -07:00
Couls
32e36f06dd remove rerolling for ghosts 2019-05-02 22:07:36 -04:00
EvadableMoxie
5c2608330c Adds Nanotrasen Hospital ship, admin shuttle templates system. 2019-05-02 20:17:50 -04:00
Mark van Alphen
05cad803bb Allow admin access to airlock buttons 2019-05-02 22:29:46 +02:00
Arkatos1
8b50022858 Old code cleanup 2019-05-02 18:31:31 +02:00
Arkatos1
fedb9c1770 Added icons, fixes, special cases resolved 2019-05-02 18:28:39 +02:00
Mark van Alphen
eac4f841ce Switch to penetrator/sopo rounds only 2019-05-02 01:39:11 +02:00
Arkatos1
2e4de13f0f Initial commit 2019-05-02 01:30:17 +02:00
Mark van Alphen
b3d7681a4a Discord feedback on bundles 2019-05-01 22:24:51 +02:00
Arkatos1
1f2c3819bd Adds 4 new plushies 2019-05-01 21:43:32 +02:00
Mark van Alphen
5216106192 Uplink kit rebalance 2019-05-01 21:35:56 +02:00
Unknown
0d81c2da7c Adds Pig Crate 2019-05-01 14:19:43 -05:00
Mark van Alphen
f7a52dcec0 COMIC injector fix 2019-05-01 21:07:43 +02:00
Mark van Alphen
86b90bab2c And fix the uplink kits 2019-05-01 21:01:16 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Arkatos1
24b0eb0c0c toolbelt update 2019-05-01 16:57:54 +02:00
Arkatos1
c6a91eafdd Tweaks 2019-05-01 16:04:07 +02:00
Arkatos1
791bebf51c Tweaks to Examine tooltips 2019-05-01 15:50:30 +02:00
Arkatos1
5d90085588 Numbers tweak 2019-05-01 12:34:33 +02:00
Kyep
29d20e6c4d Fixes runtime in job_exp.dm 2019-04-30 18:28:00 -07:00
variableundefined
9d32120975 Merge pull request #11413 from Arkatos1/carp 
Carp Expansion Pack
 2019-05-01 08:50:52 +08:00
Arkatos1
7363c31ea9 Initial commit 2019-04-30 23:59:28 +02:00
AffectedArc07
bdc5452609 Globalise this 2019-04-30 21:12:09 +01:00
Arkatos1
1e363bfb88 Craftable patch pack 2019-04-30 19:51:01 +02:00
Mark van Alphen
ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
 2019-04-30 19:26:17 +02:00
Mark van Alphen
84140d75a0 Merge branch 'lighting' of https://github.com/Markolie/Paradise into lighting 2019-04-30 19:17:41 +02:00
Mark van Alphen
4ad9fd4d18 Correct value 2019-04-30 19:17:34 +02:00
Mark van Alphen
e2cf2782af Re-add fast_despawn 2019-04-30 19:16:44 +02:00
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
variableundefined
c8d890ef8a Merge pull request #11365 from Kyep/id_card_tracking 
Upgrades ID Computer
 2019-04-30 13:28:03 +08:00
variableundefined
610f118ee8 Merge pull request #11370 from Arkatos1/RevNames 
Revenants now have randomly generated flavor names
 2019-04-30 13:25:17 +08:00
variableundefined
3ae90a2608 Merge pull request #11369 from Arkatos1/Boards 
Circuit Boards now show their required components on examine
 2019-04-30 13:24:58 +08:00
variableundefined
2ac85e6ec6 Merge pull request #11406 from Arkatos1/blobanimate 
Blob cleanup update
 2019-04-30 13:07:29 +08:00
variableundefined
0b5f0df20f Merge pull request #11400 from Arkatos1/torch 
Adds new torch sprites + tweaks
 2019-04-30 13:05:33 +08:00
variableundefined
75a9ca9a10 Merge pull request #11397 from Arkatos1/cabinet 
Fire extinguisher cabinet QoL update
 2019-04-30 13:05:12 +08:00
variableundefined
31a645eb32 Merge pull request #11377 from Arkatos1/Tank 
Allows you to easily replace tanks in canisters & pumps
 2019-04-30 13:04:42 +08:00
variableundefined
32376093cb Merge pull request #11393 from Fox-McCloud/powernet-refactor 
TG Powernet Refactor
 2019-04-30 12:42:53 +08:00
variableundefined
5e1a1fa10c Merge pull request #11389 from Kyep/hub_entry_update 
Improves Hub Listing
 2019-04-30 12:08:32 +08:00
Kyep
07b269264a restricts deletion of only your logs to centcom, deletion of all requires ID computer access 2019-04-29 20:47:45 -07:00