cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-20 14:32:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,839 Commits 28 Branches 2 Tags
23139987a05a50e3ebfcf85fdf9784e69e0de129
Commit Graph

6031 Commits

Author SHA1 Message Date
Brian McGillivray
23139987a0 Tweak: Mr Chang's vending machine now refillable 
Changed the Mr Chang's vending machine to be able to be refiled with a
new Chinese vending refill canister crate that can be ordered by Cargo.
 2017-02-02 15:49:27 +00:00
Fox McCloud
3d587dea5b Merge pull request #6177 from uraniummeltdown/new 
Cyborg Blueprints
 2017-02-02 00:50:33 -05:00
uraniummeltdown
7259e4ce07 blueprints for engiborgs 2017-01-31 19:22:29 +04:00
Fox McCloud
0874ea7295 Merge pull request #6152 from uraniummeltdown/windowflash 
Window Flashing
 2017-01-31 01:30:39 -05:00
Crazy Lemon
cd31694e12 Merge pull request #6253 from fludd12/GhostBar 
Respawner Machine (Attempt Deux)
 2017-01-27 16:59:36 -08:00
Fox McCloud
a1ac4a9ec2 Merge pull request #6231 from Aurorablade/ThePowerOfSalt 
THE POWER OF SALT COMPELS YOU
 2017-01-26 10:52:44 -05:00
Aurorablade
55e58ef471 honk 2017-01-26 10:39:48 -05:00
fludd12
bb263d58c5 #JustAdminThings 2017-01-26 09:23:49 -05:00
Crazy Lemon
0e42e416b6 Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor 
Makes Reagents Holder Process and Refactors NOREACT
 2017-01-26 03:47:30 -08:00
fludd12
3cff59ec74 Adds Respawner 2017-01-26 05:09:44 -05:00
Crazy Lemon
15dca8b4aa Merge pull request #6226 from Fox-McCloud/debug-this 
Removes Unused Object
 2017-01-25 04:15:18 -08:00
Aurorablade
29c6a89f45 removes processed bread 2017-01-24 23:24:49 -05:00
Aurorablade
318c339f11 icons are silly 2017-01-23 18:32:40 -05:00
Aurorablade
eb4b320676 fox changes 2017-01-23 18:31:13 -05:00
Aurorablade
64b8200823 changes 2017-01-22 19:42:13 -05:00
Aurorablade
1769672037 this icon was a thing.... 2017-01-21 19:37:08 -05:00
Aurorablade
8f3ea0d5cb blrghh 2017-01-21 08:50:58 -05:00
Aurorablade
559fcebb57 ferp 2017-01-21 08:50:30 -05:00
Aurorablade
0d125c20a0 why do i do this.. 2017-01-21 06:17:06 -05:00
Fox-McCloud
723e87effd Removes Unused Object 2017-01-20 21:50:00 -05:00
Crazy Lemon
2a209f62cd Merge pull request #5814 from Markolie/ann2 
Announcement refactor
 2017-01-18 19:17:30 -08:00
Crazy Lemon
37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade 
Adds log stacking to admin logs
 2017-01-18 19:13:50 -08:00
Mieszko Jędrzejczak
1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Chakirski
b41009c685 matter_is_neither_created_nor_destroyed 2017-01-16 00:54:56 -06:00
Fox-McCloud
ea8080e6c9 Makes Reagents Holder Process and Refactors NOREACT 2017-01-14 20:09:49 -05:00
Crazylemon64
224f86bd64 Bibles can reveal runes now 2017-01-13 13:42:56 -08:00
TullyBurnalot
a0d1f4333c Removes needless "The"s 2017-01-12 22:17:52 +00:00
TullyBurnalot
632030daa3 Addressing request by Fox 2017-01-12 22:05:13 +00:00
TullyBurnalot
d8d5279d66 Cyborg tools not allowed in display cases 2017-01-12 21:36:19 +00:00
TullyBurnalot
8dd1856121 Graffiti prints are now hidden 2017-01-12 20:24:17 +00:00
TullyBurnalot
cb4674fb78 Graffiti now have fingerprints 2017-01-12 19:54:36 +00:00
uraniummeltdown
11c0cb73f6 added it to defib, cloning, strange reagent 2017-01-12 19:44:18 +04:00
Aurorablade
5a07759c97 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie 2017-01-11 23:41:06 -05:00
Fox McCloud
68dfbf6217 Merge pull request #6131 from Crazylemon64/robot_module_actions 
Robot module actions
 2017-01-11 08:50:50 -05:00
Crazylemon64
a852d3f314 Fixes a garrote runtime 2017-01-10 18:28:40 -08:00
Fox McCloud
ef3e433f07 Merge pull request #6125 from Crazylemon64/spiders_non_xeno 
Giant Spiders no longer clog up the Alien role channel
 2017-01-10 17:46:43 -05:00
Crazy Lemon
f1c3a7cd13 Merge pull request #6085 from Fox-McCloud/food-rework 
Food rework
 2017-01-10 12:11:17 -08:00
Crazylemon64
36b967c93b Fully rips out cyborg sight modules 2017-01-10 00:32:11 -08:00
Crazylemon64
131978db2d Borgs now actually have their module actions revoked upon module removal 2017-01-10 00:18:46 -08:00
Crazylemon64
66f2d40afa Giant Spiders no longer clog up the Alien role channel 2017-01-09 13:38:34 -08:00
Fox McCloud
8b7ce46155 Merge pull request #5959 from Markolie/fixinwall 
False walls now block atmos
 2017-01-07 14:19:53 -05:00
Aurorablade
155464b3a0 brain.exe had caused a critcal error and shut down 2017-01-07 01:03:46 -05:00
Aurorablade
0e35706c00 damn.... 2017-01-06 23:32:17 -05:00
Fox McCloud
7de4280755 Merge pull request #6052 from Crazylemon64/morguelights 
Morgue trays now have descriptions that correspond to their contents
 2017-01-06 12:45:15 -05:00
Crazy Lemon
af0c8e888a Merge pull request #4392 from Aurorablade/BookClub 
Book Club Refactor/butchering
 2017-01-06 05:55:01 -08:00
Fox McCloud
4f86cee581 Merge pull request #6053 from Crazylemon64/secure_buckles 
Shuttles no longer disable buckling
 2017-01-06 08:14:22 -05:00
Crazylemon64
ec0f13d41e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:01:43 -08:00
Crazylemon64
ac612d4924 Fixes construction talisman 
Fixes supply talisman
 2017-01-06 04:32:59 -08:00
Aurorablade
113f2770e3 somethingsomethingcaffine 2017-01-06 06:33:12 -05:00
Aurorablade
7fb084d690 tries to address comments... 
and will get them wrong.
 2017-01-05 22:07:21 -05:00