cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 10:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

120 Commits

Author SHA1 Message Date
Terilia
b281d26ac1 Added Donksoft Sniper to the spawn pool 2019-06-04 13:33:12 +01:00
Mark van Alphen
d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-04 03:16:38 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Mark van Alphen
a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Mark van Alphen
ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Kyep
3559a77d0f Uplink improvements 2019-03-19 04:35:03 -07:00
Kyep
28ae61ee2c +talisman, -midgitSE, +cluster grenades, -goliathhide, +KAmodkit, +bartenderkit, +chefkit, -bananade 2019-01-10 17:24:55 -08:00
Kyep
e69c74259a adds BoH/nvmeson/matscanner/thermals, moves speed potion 2019-01-10 16:01:46 -08:00
Kyep
dd2808313e adds bluespace rpd, removes strange object 2019-01-10 15:36:12 -08:00
Kyep
51279caafd adds healgland, cycler shotgun, enforcers, oxytank 2019-01-10 15:19:41 -08:00
Kyep
787aee9655 replace trade objectives with 15 plasma bars & 10,000c 2019-01-10 15:16:59 -08:00
Kyep
8a4461c89e tweaks comment 2019-01-09 00:04:47 -08:00
Kyep
ee5c6421a6 spacing 2019-01-07 22:52:52 -08:00
Kyep
bf9d0b088f merge conflict fix, reset map 2019-01-07 16:37:07 -08:00
variableundefined
25f4665da7 Merge pull request #10580 from datlo/capufakedeath 
Capulettium/Capu+ fakes death convincingly
 2019-01-06 16:12:56 +08:00
Kyep
29e62bf0bc blue snowmobile 2019-01-03 20:49:33 -08:00
Kyep
0567eab562 Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update 2019-01-03 14:40:07 -08:00
Kyep
d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
datlo
244fcfc739 capu/capu+ fake death for realsies, add fake death pills to syndis/maint 2019-01-02 09:46:03 +00:00
Mithrandalf
0e9191cdd4 Adds the cuffs to the code and the map 2018-12-27 17:01:40 +00:00
Kyep
46acb9338b sunglasses, seeds, KA, IMS, fleshy 2018-12-22 14:16:25 +00:00
Kyep
702f4db165 outfit, vehicles, paperfix, viruses 2018-12-12 00:31:56 -08:00
Kyep
c49892c17d Desolate's suggestions 2018-12-10 17:06:45 -08:00
Kyep
4427d02acd researchnotes, pills, injector runtime 2018-12-09 00:41:11 -08:00
Kyep
7c1f40ea14 WIP omnizine/SR/virus bottles, minerals 2018-12-08 19:33:21 -08:00
Kyep
23eb2bb956 v1, WIP 2018-12-08 04:03:09 -08:00
Kyep
038fb2ef67 replaces explosive mines with (new) sentry mines 2018-12-07 01:11:15 -08:00
Kyep
2593daac80 reduces pizza bomb chance from 50% to 33% 2018-12-06 19:17:58 -08:00
Kyep
0d91b3b619 deletes trapped syndi toolbox 2018-12-06 19:13:56 -08:00
AzuleUtama
9f0c127d9a Add syndi cigs to maint loot 
Since an item classed as legal can only be gotten on the uplink right now.
 2018-11-21 11:21:24 +00:00
Spartan6
80e8b4ff19 Adds plastic bags and wet floor signs to loot maint 2018-11-07 00:52:36 +00:00
AzuleUtama
7ffa8d848c Replace military belt with traitor toolbelt in Maintenance Loot 2018-11-04 17:26:14 +00:00
variableundefined
309e3b04f6 Clears up some relative pathing part 1 2018-10-10 23:39:34 +08:00
Purpose
3411d92642 adds the plasma window spawners 2018-10-07 00:15:18 +01:00
Kyep
7f3fbcf491 fixes shields-under-falsewall bug 2018-08-18 17:24:55 -07:00
Kyep
27473c3e3e better fix for boss cheese 2018-08-08 23:02:08 -07:00
Kyep
477912dc72 CrazyLemon 2, more small stuff 2018-08-06 21:19:10 -07:00
Kyep
1f65c9a734 CrazyLemon 1, all the minor issues 2018-08-06 21:08:01 -07:00
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
Kyep
7a493a5151 neca-inspired loot list adjustments 2018-07-31 17:48:02 -07:00
Crazylemon64
b2d0bb1c0b Fixes maploading so that the cyberiad and space hotel load cleanly again 2018-07-24 20:58:38 -07:00
Kyep
2e5f6fe6d5 squash 2018-07-07 16:32:00 -07:00
Kyep
f506319d9b Fox 5 2018-07-07 16:30:36 -07:00
Kyep
c3ed490159 Fox 4 2018-07-07 16:15:26 -07:00
Kyep
f7b0e03fc2 Fox 3 2018-07-07 16:14:01 -07:00
Fox McCloud
6c9f83f685 Stechkin Maintenance Pistol Change 2018-06-30 19:24:56 -04:00
Kyep
4308d658f3 a bunch of fixes & tweaks 
jaunters no longer let you escape depot, sentry bot can now be deactivated (for alert increase, via ai console), sentry bot no longer alerts when it get stuck - but does log to debug log, calling red alert with comms console depowered no longer spawns backup, armory door sprites improved, syndi depot beacon never enabled during nukeops, loot table tweaks, removed DM spawner custom icons
 2018-06-27 11:34:28 -07:00
Kyep
ca51392db0 loot tweaks 2018-06-22 19:32:13 -07:00
Kyep
bc9521f5ca logging, anticheese 2018-06-22 19:26:59 -07:00
Kyep
9a7694771b mob AI, typing, logging, ghost notifications, tile cleanup 2018-06-21 06:55:53 -07:00