cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-03-29 16:43:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,659 Commits 12 Branches 2 Tags
dd720d4bfbfdb4f28dc4c32cecefbcc62fef81f0
Commit Graph

13580 Commits

Author SHA1 Message Date
ZomgPonies
dd720d4bfb No more magic missiling fellow wizards or your apprentice. 2014-07-20 03:39:03 -04:00
ZomgPonies
ef7db2b807 Merge pull request #308 from mwerezak/paradise-docking 
Fixes Special Operations shuttle having wrong initial tag set
 2014-07-20 02:35:10 -04:00
ZomgPonies
c5785ee171 Re-add borers to potential random events 2014-07-20 02:26:42 -04:00
Walter0o
1bf157d4cc borer detatch fixes 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
 2014-07-20 02:20:16 -04:00
Walter0o
503cffaf96 borer detatch fixes 2014-07-20 02:14:14 -04:00
Walter0o
5c264d9ae3 fixes borer infest and detatch 
Conflicts:
	code/modules/mob/living/simple_animal/borer.dm
 2014-07-20 02:13:58 -04:00
mwerezak
be23f29297 Fixes SpecOps shuttle having wrong initial tag set 2014-07-19 20:43:45 -04:00
ZomgPonies
65d0da764c Revert "Test to make alt-click be usable at more than 1 tile away" 
This reverts commit 28efcd9f22.
 2014-07-19 16:31:41 -04:00
ZomgPonies
8aacab1627 Regular gygax can only fit nonlethal weapons. 2014-07-19 16:27:11 -04:00
ZomgPonies
28efcd9f22 Test to make alt-click be usable at more than 1 tile away 2014-07-19 15:54:47 -04:00
ZomgPonies
fd5846d53a Added click delay to point to because people are too shitty to not abuse it. 2014-07-19 15:26:13 -04:00
ZomgPonies
653a0bdf37 Added signpost to show NT recruitment office location 2014-07-19 15:19:13 -04:00
ZomgPonies
66190afce9 Runtime fix 2014-07-19 14:42:14 -04:00
ZomgPonies
43a9a411ad Merge pull request #306 from VampyrBytes/master 
Fixes #247
 2014-07-19 13:33:34 -04:00
ZomgPonies
64554340f4 Modifed faction system to use a list instead. Mobs can belong to multiple factions at once. 2014-07-19 13:26:55 -04:00
ZomgPonies
e2a9e93a59 Revert "Use IconProcs lib ReadRGB instead of another same functionality proc." 
This reverts commit 11f1d82c65.
 2014-07-19 11:43:48 -04:00
d3athrow
e650eed15d Pomf did a thing. Firelocks now indicate cold or hot temperatures. 
Conflicts:
	code/game/machinery/doors/firedoor.dm
	html/changelog.html
 2014-07-19 11:43:36 -04:00
ESwordTheCat
11f1d82c65 Use IconProcs lib ReadRGB instead of another same functionality proc. 
Conflicts:
	code/modules/reagents/Chemistry-Colours.dm
 2014-07-19 11:19:52 -04:00
Neerti
47ded176f2 Changes the wiki proc to accept player input to reach a specific page, or search for one if the wiki can't find it. 
You can use it by typing 'wiki [query]' in the command box, for example 'wiki cult' brings up the cult guide, or clicking the wiki button at the top-right and typing what you want to look for.
It uses wikiurl, so other servers should be compilable, if they change their wikiurl.

Conflicts:
	interface/interface.dm
 2014-07-19 10:57:57 -04:00
ZomgPonies
ac68d0799d Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-19 10:52:33 -04:00
Mark Aherne
9a62de164d Update NanoUI Live Map. 
* Simplified how items are positioned on the map (e.g. ((value.x - 1) * 8) is now just value.x, scaling is applied later).
* Added four zoom levels (x1.0 to x2.5, triggered by links in the template).
* Moved the "Generate NanoUI Map" into the Server tab, to prevent it being used by admins accidentally.

Conflicts:
	nano/images/nanomap.png
 2014-07-19 10:51:01 -04:00
ZomgPonies
5d58322b0a Merge pull request #305 from SamCroswell/master 
Added new eye-replacement glasses
 2014-07-19 10:40:40 -04:00
ZomgPonies
98a99ebd1a Change middlemouseclick to point, removed point from right-click contextual menu 2014-07-19 04:19:58 -04:00
ZomgPonies
a88da5691a Removing examine from popup menu to help with right-click lag. Use shift-click instead. 2014-07-19 04:03:23 -04:00
SamCroswell
72f4607fad Added new eye-replacement glasses 
These aren't intended for everyday use, I plan to incorporate them into
future events.
 2014-07-19 02:17:20 -04:00
Mark Aherne
de81fdd4ac Added PDA check in wear_id slot to get any potential id rank. 2014-07-19 02:12:27 -04:00
Mark Aherne
8ddf65012c Improved Crew Monitoring Console map. 
Added icons for use with map.
 2014-07-19 02:12:12 -04:00
Mark Aherne
ec29e88224 Added a station map to NanoUI, this map can be used by any NanoUI to display live/dynamic elements on a map. 
The map functionality has been added to the crew monitor console to show active crew trackers, this is working but needs refinement (icons etc.).

Conflicts:
	code/modules/nano/nanoui.dm
 2014-07-19 02:11:44 -04:00
Loganbacca
4dd5368c01 Fixed resisting out of lockers 2014-07-18 17:54:42 -04:00
Loganbacca
2fd4774d01 Fix resisting out of closets 
- Removed do_after proc since it was hanging somewhere
 2014-07-18 17:54:31 -04:00
ZomgPonies
01ce1db6ff Fix drag and drop climbing, finally 2014-07-18 17:35:35 -04:00
mwerezak
19d2d549e2 Fixes #5666 2014-07-18 16:37:30 -04:00
ZomgPonies
4d2ead97d6 Merge pull request #304 from SocialSystem/patch-1 
Update vg_powers.dm
 2014-07-18 14:49:35 -04:00
ZomgPonies
c48ca761ba Fixed a few bugs with genetic power buttons 2014-07-18 14:47:44 -04:00
SocialSystem
fcacbdbee3 Update vg_powers.dm 
Altered the activation/deactivation message for morph so it is different from SHOCKIMMUNITY
 2014-07-18 19:34:11 +01:00
ZomgPonies
7a90302747 Fixed immolate 2014-07-18 13:41:44 -04:00
ZomgPonies
fd53529ddc Removed stupid MELT genetic power that was broken anyways 2014-07-18 13:39:02 -04:00
ZomgPonies
635fb6f7e2 Added empath as a spell along with action button 2014-07-18 13:26:58 -04:00
ZomgPonies
c5dac036e1 Fix drag and drop table climbing 2014-07-18 13:04:41 -04:00
ZomgPonies
60b0659d43 Made update_power be at mob level since spells are at that level. 2014-07-18 12:11:13 -04:00
ZomgPonies
9148e4b4a9 Removing more deprecated virus1 shit 2014-07-18 11:41:46 -04:00
ZomgPonies
7b481d2b9e Merge pull request #303 from VampyrBytes/master 
fix for #300
 2014-07-18 08:39:33 -04:00
VampyrBytes
1c9f9966bf Fixes #247 
No more sending crates to centcom to be unlocked, they'll keep
everything now
 2014-07-18 13:20:00 +01:00
mwerezak
d30db958d4 Loosens the undocking requirements for airlocks 2014-07-18 08:03:53 -04:00
mwerezak
3ede5aa470 Adds default values for some docking tags 
Simplifies the mapping of docking controllers by cutting down on the
number of tags needed to be entered.

Conflicts:
	code/game/machinery/embedded_controller/simple_docking_controller.dm
 2014-07-18 08:03:15 -04:00
Zuhayr
0ddab372bf Added glass to the engineering module. 2014-07-18 07:38:30 -04:00
Zuhayr
3098c80f9c Fixed some bugs, did some testing, moved some procs around for robot functionality. 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2014-07-18 07:38:11 -04:00
ZomgPonies
ff2557eb91 Compile fix 2014-07-18 07:35:22 -04:00
Zuhayr
0436cd3e48 Added paperwork handler, clerical gripper, some other tweaks. 
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-07-18 07:34:12 -04:00
Zuhayr
8ae76446b7 Temp commit with robot module work 
Conflicts:
	icons/mob/head.dmi
 2014-07-18 07:32:09 -04:00