cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 00:52:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,736 Commits 26 Branches 2 Tags
62fb3c29813e2894de6aa13c5653900aa51e3f72
Commit Graph

2149 Commits

Author SHA1 Message Date
Markolie
b914544a87 Fixes 2015-09-27 22:50:09 +02:00
Markolie
a47b86e3c5 Whoops, add return 2015-09-27 08:48:43 +02:00
Markolie
bcc3f2483a Prevent shadowlings from hatching in lockers 2015-09-27 08:43:08 +02:00
Fox-McCloud
469295e791 Merge pull request #2183 from Markolie/zefixes 
Changeling language fix, additional logging
 2015-09-26 17:40:46 -04:00
Markolie
1011d57321 Changeling language fix, additional logging 2015-09-26 22:27:36 +02:00
Fox-McCloud
ae38db0bd8 Merge pull request #2172 from Markolie/zefixes 
Various fixes
 2015-09-26 16:25:22 -04:00
Markolie
95fa836d68 Various fixes 2015-09-26 04:51:36 +02:00
Tigercat2000
4f3938d68b -tg- buckling system 
This commit overhauls a bunch of systems so that buckling works for
any subtype of /obj. This means that space vines and chairs and beds all
use the same system. A lot of stuff has been touched.
 2015-09-24 15:52:10 -07:00
Markolie
1a2459de0a check_rights/R_MOD update 2015-09-24 04:35:04 +02:00
Markolie
14f64b2b24 Fixes for Vox/Plasmamen highlanders/dodgeball players 2015-09-23 21:17:40 +02:00
Markolie
b4a4f29f3f Vox/Plasmaman spawn/wizard update 2015-09-23 08:14:12 +02:00
Markolie
9adff714b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql 
Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt
 2015-09-23 07:07:17 +02:00
Markolie
bbaa60c8ce Fixes 2015-09-23 06:22:00 +02:00
Markolie
bec9fca533 SQL update 2015-09-23 06:13:42 +02:00
Markolie
c5c64413a1 Pipenet overhaul 2015-09-21 02:11:54 +02:00
TheDZD
7e9b2f99b1 Merge pull request #2091 from Fox-McCloud/destroy-them-all 
Fixes up a few Destroys
 2015-09-18 22:30:49 -04:00
Fox-McCloud
d3dd7d73b6 Merge pull request #2083 from Markolie/loco 
Event tweaks
 2015-09-18 17:50:39 -04:00
Fox-McCloud
1d91e31d17 pass II, taperecorder exploit fix 2015-09-18 05:46:00 -04:00
Fox-McCloud
7c7838445f Merge pull request #2089 from Markolie/fixesss 
Fixesss
 2015-09-17 23:25:01 -04:00
Markolie
2e064a1050 Fix Wizard infinite spell exploit 2015-09-18 05:03:17 +02:00
Markolie
ed9a63763e More event tweaks 2015-09-17 22:25:35 +02:00
Markolie
34552f259c Event updates 2015-09-17 21:34:51 +02:00
Markolie
f4f42ab17b Make meteors not collide with eachother 2015-09-17 18:32:39 +02:00
Tigercat2000
c562680098 Merge remote-tracking branch 'origin/master' into bay_examine 
# Conflicts:
#	code/game/objects/structures/displaycase.dm
 2015-09-15 14:08:36 -07:00
Markolie
90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom 
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi
 2015-09-15 04:18:27 +02:00
Fox-McCloud
6fd7350746 Merge pull request #2040 from Markolie/guns 
Guns update
 2015-09-14 22:11:33 -04:00
Markolie
84c60aa560 Monkey/human transform fixes 2015-09-14 22:13:32 +02:00
Tigercat2000
0603f73232 Bay12 examine overhaul. 
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
 2015-09-14 11:51:40 -07:00
Markolie
f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Fox-McCloud
58d40b730d Changeling Swap Forms Language Fix 2015-09-13 12:33:42 -04:00
Mark van Alphen
04bc49f29e Merge pull request #2004 from Fox-McCloud/blob-rebalance 
Blob Rebalance
 2015-09-12 01:36:49 +02:00
Markolie
caf5603822 Properly remove shadowling/cult status from robots 2015-09-11 06:46:07 +02:00
Markolie
a9a8433fbe Add hiddenprints to runes 2015-09-11 06:36:23 +02:00
Markolie
34a32e7166 Fix cult deconversion icons 2015-09-11 06:17:29 +02:00
Fox-McCloud
f31bf75764 Blob Rebalance 2015-09-10 19:12:59 -04:00
Fox-McCloud
8e88ceabd1 fix 2015-09-08 22:25:21 -04:00
Fox-McCloud
380d085f28 ERT exception 2015-09-08 20:12:28 -04:00
Fox-McCloud
b674f247b8 Hijack Objective Rework+Fix 2015-09-08 16:44:51 -04:00
Fox-McCloud
64b2bb3784 Merge remote-tracking branch 'upstream/master' into material-datums 2015-09-04 22:53:20 -04:00
Fox-McCloud
e8f486f397 Merge pull request #1946 from Markolie/intercom 
Remove radio free range
 2015-09-04 22:47:24 -04:00
TheDZD
07acac3bfd Merge pull request #1944 from Fox-McCloud/cult-tweaks 
Cult Tweaks
 2015-09-04 22:01:11 -04:00
Markolie
26d0ad3071 Radio access update 2015-09-04 19:29:56 +02:00
Fox-McCloud
a019934e9e Pass I 2015-09-04 05:18:48 -04:00
Markolie
3a3457de36 Port Bay's intercom overhaul 2015-09-03 21:21:20 +02:00
Fox-McCloud
9b01dff587 bible rune fix 2015-09-02 22:08:27 -04:00
Fox-McCloud
9b8342897e Cult Tweaks 2015-09-02 21:08:08 -04:00
Fox-McCloud
50e36fa48c Merge pull request #1927 from Markolie/cultspeech 
Add custom styling to cult messages
 2015-09-02 15:59:43 -04:00
Fox-McCloud
9695509908 Merge pull request #1919 from tigercat2000/funlittletgthings 
Progress bars
 2015-09-01 16:45:10 -04:00
Fox-McCloud
2d0f77fa1b Merge pull request #1916 from Markolie/looc 
Reboot improvements, player panel fix, IsBanned fix
 2015-09-01 16:42:09 -04:00