cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 18:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,736 Commits 26 Branches 2 Tags
ef6aeeb7d42e86bceecc23d609b25d46802f7aed
Commit Graph

791 Commits

Author SHA1 Message Date
Markolie
f7fe8c8c6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-09-28 03:05:04 +02:00
Fox-McCloud
d7f23f4271 Oh, that kind of list 2015-09-27 19:39:09 -04:00
Fox-McCloud
155afc6131 lists 2015-09-27 19:24:35 -04:00
Markolie
b914544a87 Fixes 2015-09-27 22:50:09 +02:00
Markolie
69f71268b8 Stop AI's from going into transit tubes 2015-09-27 03:38:22 +02:00
Fox-McCloud
4413911688 Janicart and Janitor Update 2015-09-26 06:17:29 -04:00
Markolie
d4e5149389 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fluff 
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
 2015-09-26 05:12:52 +02:00
Tigercat2000
4b6a3ddcb6 -tg- SpaceMove update 
This commit updates the spacemove system to -tg-'s; All objects now drift
in space, not just mobs. A few hardcoded space checks have been replaced
with has_gravity(); So it applies to zero-G as well as space.

Spacepods no longer drift, because their snowflakey shitcode just doesn't
work. So they just move.
 2015-09-25 15:53:59 -07:00
Markolie
e96103a02b Fluff item clean-up 2015-09-25 04:31:30 +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
Fox-McCloud
a26bf7172b Merge pull request #2139 from Markolie/sql 
Nuke the privacy poll, offer ghosts control option, memo update, SQL update, fixes
 2015-09-23 23:42:06 -04:00
Fox-McCloud
d602d128f7 Merge remote-tracking branch 'upstream/master' into rcs-update 2015-09-23 01:19:28 -04: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
73bacbf17f Preference option for instruments/sanitize tempo 2015-09-23 07:00:01 +02:00
Fox-McCloud
36ec45253e Merge remote-tracking branch 'upstream/master' into rcs-update 2015-09-21 00:30:00 -04:00
Fox-McCloud
4e9befc310 Tweaks 2015-09-21 00:25:27 -04:00
Fox-McCloud
bd3696523b GC a few Datums 2015-09-20 22:40:13 -04:00
Markolie
c5c64413a1 Pipenet overhaul 2015-09-21 02:11:54 +02:00
Fox-McCloud
263c67ea2e tweak 2015-09-20 17:26:01 -04:00
Fox-McCloud
72e14e59da RCS Update and Tweaks 2015-09-20 03:09:18 -04:00
Fox-McCloud
2d52bd90e1 Syndicate Ship Update 2015-09-17 08:22:50 -04: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
Fox-McCloud
3aa9563f2b Merge pull request #2049 from Markolie/display 
Display case update
 2015-09-15 16:02:43 -04:00
Markolie
0db5d89354 Notice --> Danger 2015-09-15 18:48:58 +02:00
Markolie
e64ac23677 Further display case improvements 2015-09-15 18:47:19 +02:00
Fox-McCloud
6fd7350746 Merge pull request #2040 from Markolie/guns 
Guns update
 2015-09-14 22:11:33 -04: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
59b78376e9 Display case update, some forceMove updates 2015-09-14 20:21:56 +02:00
Markolie
f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
Fox-McCloud
f68518e3c1 Table Rack Destruction 2015-09-13 01:59:13 -04:00
Mark van Alphen
84b42c5491 Merge pull request #1986 from Fox-McCloud/nuke-and-tator 
Nuke Ops and Traitor Update+Balance
 2015-09-10 02:24:32 +02:00
Mark van Alphen
e499554fef Merge pull request #1984 from Fox-McCloud/mining-voucher 
Adds Mining Voucher to QM's locker
 2015-09-10 01:13:58 +02:00
Fox-McCloud
1c6c733a52 Nuke Ops and Traitor Update+Balance 2015-09-08 19:38:30 -04:00
Fox-McCloud
1d7ecf48ff Adds Mining Voucher to QM's locker 2015-09-08 12:53:57 -04:00
Tigercat2000
ee32c0a35a Merge branch 'master' into intent_define 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2015-09-08 04:43:13 -07:00
Mark van Alphen
6c1208e18f Merge pull request #1819 from Aurorablade/GoOnYourFeet 
[Sprite] [TG Port] Things that go on your feet
 2015-09-07 22:31:21 +02:00
Tigercat2000
be92665871 Replace magic intent words with defines, grab fixes 
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
 2015-09-07 11:51:00 -07:00
KasparoVy
f3ba11fbda Adds Warden Corporate and HoS Corporate Uniforms to Appropriate Lockers 2015-09-04 15:49:27 -04:00
Fox-McCloud
e2347866a8 Merge pull request #1926 from Markolie/lordoftheflies 
Make lockers use forceMove()
 2015-09-02 15:58:09 -04:00
Markolie
8d7bd64a00 Make lockers use forceMove() 2015-09-01 18:49:19 +02:00
Tigercat2000
7f4ac72910 Progress bars + Wall Rationalization 
This commit does the following:
 - Ports progress bars from -tg- (tgstation/-tg-station#9921)
 - Refactors wall attackby code to make it 100% less insane; Instead of
   manually checking every little thing, it uses do_after,
   consequentially, making the new progress bars affect dealing with walls
   as well.

Wall code makes a tiger sad.
 2015-08-31 13:38:51 -07:00
Aurorablade
0f1a44eb2e Merge remote-tracking branch 'ParadiseSS13/master' into GoOnYourFeet 2015-08-29 20:12:41 -04:00
Fox-McCloud
67f1b00291 Transit Tube Update 2015-08-29 18:22:29 -04:00
Tigercat2000
a54be7c47b Centcomm Mods 
Moved the kitchen and dorms to be sticking out less
Added escape bathrooms
 2015-08-27 12:59:37 -07:00
Aurorablade
ac6a2baa80 Sock port 
Plus fix to secruity records text
 2015-08-21 17:43:16 -04:00
Fox-McCloud
333e7fe236 Merge pull request #1766 from Markolie/adminbus 
Admin jump overhaul, add watchlist functionality, other admin updates
 2015-08-17 18:10:38 -04:00
Markolie
8af3c8c47a Final fixes/mech attack update 2015-08-17 00:32:50 +02:00
Markolie
5eee617063 Consolidate ?/FLW links under key_name_admin 2015-08-17 00:13:53 +02:00
Markolie
a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
Tigercat2000
748da30bb6 -tg- underware overhaul 
This commit overhauls the underwear/undershirt system to -tg-'s text-based
version. No more magic numbers, just text states.

Note, this modifies the SQL Schema, and existing databases must be
modified by the following SQL:

ALTER TABLE server_db.characters
	CHANGE underwear underwear MEDIUMTEXT NOT NULL,
	CHANGE undershirt undershirt MEDIUMTEXT NOT NULL;
 2015-08-13 17:45:52 -07:00