cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 13:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,727 Commits 26 Branches 2 Tags
5e9e417bb4e2454ae1b201a00401fed91c854e05
Commit Graph

6020 Commits

Author SHA1 Message Date
Fox-McCloud
084ed30446 more fixes and features 2017-01-25 01:04:01 -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
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
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
Fox-McCloud
ea76990b7a Botany Rework 2017-01-21 18:28:03 -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
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
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
Crazylemon64
ff91d4818a Picky nits 2017-01-01 21:53:31 -08:00
Crazylemon64
d79c42fa1e Shifts the checking procs to appropriate regions 2017-01-01 21:46:55 -08:00
Crazylemon64
27ada86bfa Morgue trays now have descriptions that correspond to their contents 2016-12-31 21:45:07 -08:00
Crazylemon64
f954382619 Adds a ui_key arg to ui_data 2016-12-31 12:51:07 -08:00
Markolie
1f243ec4f0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/_globalvars/lists/objects.dm
 2016-12-31 17:54:06 +01:00
Aurorablade
fc71122914 fixes 
Barring any errent merge conflict fixing fuckery.
 2016-12-29 11:39:18 -05:00
Aurorablade
98b7a89a17 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 
# Conflicts:
#	code/game/machinery/doors/airlock.dm
 2016-12-29 11:01:43 -05:00
Aurorablade
dd75048969 well hopefully last conflict fix with shuttle merger 2016-12-29 10:33:48 -05:00
Aurorablade
e25ddf8329 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-24 00:18:40 -05:00
Markolie
e2587dbbbf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm
 2016-12-23 19:04:35 +01:00
Fox McCloud
5a01a6c7d3 Merge pull request #5840 from Crazylemon64/adds_reset_perspective 
Polishes up `reset_view`
 2016-12-23 07:27:36 -05:00