cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 22:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,961 Commits 26 Branches 2 Tags
4a155bfb50adaa17db07a0e15e7adffda46a2eb2
Commit Graph

6077 Commits

Author SHA1 Message Date
Markolie
4a155bfb50 Admin interaction update 2017-02-08 23:27:08 +01:00
Fox-McCloud
390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
Crazy Lemon
01c41cfb86 Merge pull request #6081 from Markolie/lavaland_megafauna 
Ports Lavaland megafauna
 2017-02-05 00:27:40 -08:00
uraniummeltdown
7dd342743a added cargo ID skin to agent ID and ID Computer 2017-02-05 09:19:52 +04:00
Fox-McCloud
f8602ffef8 last fixes, hopefully 2017-02-04 04:28:42 -05:00
Fox McCloud
917fb17e16 Merge pull request #6315 from DrunkDwarf/mrchangs-tweak 
Tweak: Mr Chang's vending machine now refillable
 2017-02-03 21:33:23 -05:00
Mark van Alphen
fe62b212b4 Merge branch 'master' into lavaland_megafauna 2017-02-02 20:17:31 +01:00
Fox McCloud
c7bb9fd91a Merge pull request #6301 from Alexshreds/bugaroo 
Deconstructing Closets Yields Proper Amount of Metal
 2017-02-02 11:07:54 -05:00
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
Chakirski
f39fe8ab75 muh future 2017-02-01 21:29:04 -06:00
Chakirski
812c2db2fe closets 2017-01-31 19:14:31 -06:00
Markolie
b55394ace3 Fix resource identifiers 2017-01-31 17:45:46 +01:00
Markolie
2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
 2017-01-31 17:44:38 +01: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
Fox-McCloud
80587202fe forcemove fixes 2017-01-27 21:03:57 -05:00
Fox-McCloud
6fb69e272c Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-27 20:15:25 -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
9fd8718bc7 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-27 19:31:07 -05:00
Markolie
ab4703623c Review changes 2017-01-27 17:46:38 +01:00
Markolie
1d7de41acb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/pooling/pool.dm
 2017-01-27 17:28:14 +01:00
Fox-McCloud
6d3ef6001f drying racks 2017-01-26 23:48:47 -05: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
Fox-McCloud
51bbe8c466 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-26 06:53:18 -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
Mark van Alphen
d55a2c4b6e Merge branch 'master' into lavaland_megafauna 2017-01-25 18:56:09 +01:00
Crazy Lemon
15dca8b4aa Merge pull request #6226 from Fox-McCloud/debug-this 
Removes Unused Object
 2017-01-25 04:15:18 -08:00
Fox-McCloud
084ed30446 more fixes and features 2017-01-25 01:04:01 -05:00
Aurorablade
29c6a89f45 removes processed bread 2017-01-24 23:24:49 -05:00
Fox-McCloud
36bfee25dc last of the missing stuff, hopefully 2017-01-24 18:33:22 -05:00
Fox-McCloud
b1f789e104 fixes a ton of thing 2017-01-24 03:23:16 -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
Fox-McCloud
3e87bd3370 more adjustments and fixes 2017-01-23 05:56:17 -05:00
Fox-McCloud
5c828db250 fixes, comfrey, and aloe 2017-01-23 05:25:42 -05:00
Fox-McCloud
7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud
dc0710135e more fixes 2017-01-23 00:53:44 -05:00
Fox-McCloud
104bfab759 sprite and code fixes 2017-01-22 23:25:56 -05:00
Aurorablade
64b8200823 changes 2017-01-22 19:42:13 -05:00
Markolie
d6276ae978 Tiger's comments 2017-01-22 19:15:26 +01:00
Fox-McCloud
706347fd84 even more work 2017-01-22 08:11:31 -05:00
Fox-McCloud
10c0e734c3 more work 2017-01-22 01:46:48 -05:00
Aurorablade
1769672037 this icon was a thing.... 2017-01-21 19:37:08 -05:00
Fox-McCloud
ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Aurorablade
8f3ea0d5cb blrghh 2017-01-21 08:50:58 -05:00
Aurorablade
559fcebb57 ferp 2017-01-21 08:50:30 -05:00