cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 13 Branches 2 Tags
dev-docs-readme
Commit Graph
1569 Commits
Author SHA1 Message Date
Markolie 7039ac7a6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-08 19:21:57 +01:00
Crazy LemonandGitHub d11dfa7a3b Merge pull request #6343 from Fox-McCloud/reagent-tank-thingy 
Refactors Reagent Tanks--Adds High Capacity Water Tank
 2017-02-07 19:58:28 -08:00
Fox-McCloud 5b8e6e7496 Advanced Camera Speedup and Sounds 2017-02-07 21:46:50 -05:00
Markolie 1d6754728b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
 2017-02-06 20:37:03 +01:00
Markolie 7a4c33bbcd Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions 2017-02-06 19:55:37 +01:00
Markolie 7bdc9a4ca7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-06 18:54:04 +01:00
Markolie 2a23862c6a Kinetic accelerator update, other fixes 2017-02-06 18:39:03 +01:00
Crazy LemonandGitHub 32bbf77be6 Merge pull request #6286 from uraniummeltdown/aimech 
AI control beacons for mechs
 2017-02-06 04:04:34 -08:00
Fox McCloudandGitHub 4e901962d4 Merge pull request #6334 from uraniummeltdown/xenoconsole 
Constructible Xenobiology Console
 2017-02-06 05:09:51 -05:00
KasparoVy ef5376ede2 conflict resolution 2017-02-05 17:13:34 -05:00
Fox-McCloud 846ce475b2 Refactors Reagent Tanks--Adds High Capacity Water Tank 2017-02-05 13:58:24 -05:00
Markolie 83cd030134 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-05 19:46:41 +01:00
Fox-McCloud 390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
uraniummeltdown 0f1e490c6f xenobiology console is now constructible, works in the area it was built in along with all similarly named areas 2017-02-05 09:42:00 +04:00
Fox-McCloud f8602ffef8 last fixes, hopefully 2017-02-04 04:28:42 -05: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 8c10df3bd3 adds AI control beacons to exofab, mechs with these installed can be controlled by any AIs 
adds diag hud icons for mechs with tracking beacons installed
 2017-01-31 20:14:05 +04:00
Fox-McCloud 36dae0bfb5 botany gene disks in R&D 2017-01-30 01:55:30 -05:00
Markolie 3633b0aaa5 Makes firelocks constructable 2017-01-28 23:18:16 +01:00
Fox McCloudandGitHub e1e0824418 Merge pull request #6202 from uraniummeltdown/xenobio 
Slime Transference Potion
 2017-01-27 20:18:19 -05:00
Fox-McCloud 9b56e9ac70 fixes and forgotten botany belt 2017-01-27 19:28:00 -05:00
KasparoVy 28f9496713 Adds Colourblindness for Vulpkanin&Tajara, Refactors Darksight, tidying up, etc. 
Adds colourblindness for Vulpkanin and Tajara that can be turned on by a
preference in character creation. By default, Vulpkanin and Tajara still
see in full colour, however their darksight is reduced to Human levels
unless they choose the 'unaugmented' eyes option.

Refactors darksight so it's tied to the eye organ. Refactors noir
glasses.

You can now visually distinguish mechanical/mechassisted organs from
their organic counterparts due to their names and icons.

Resolves issue w/ Colour-vision after Cloning/Lesser-to-greater Formswapping.

Cloned Vulpkanin and Tajara get unaugmented vision (colourblind and
darksight) by default since the cloners can't administer the
eye-augmentation surgery. Same goes for swapping from lesser to greater
form as a Changeling.

The monkey-forms of Vulpkanin and Tajara now have almost the same organs as
their greater forms, meaning they get the same colourblindness but
excellent darksight.
 2017-01-25 23:06:30 -05:00
Fox-McCloud b1f789e104 fixes a ton of thing 2017-01-24 03:23:16 -05:00
Fox-McCloud 7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud 104bfab759 sprite and code fixes 2017-01-22 23:25:56 -05:00
Fox-McCloud ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
uraniummeltdown aa9f57b00e slime glass reaction, slimepotions check for proximity 2017-01-21 10:52:25 +04:00
Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
 2017-01-20 23:43:35 +01:00
Crazy LemonandGitHub 37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade 
Adds log stacking to admin logs
 2017-01-18 19:13:50 -08:00
uraniummeltdown 22d7731fb3 << -> to_chat 2017-01-19 06:10:43 +04:00
uraniummeltdown f7f926e1fa adds transfer potion to xenobio rainbow core + blood, potion and reaction 2017-01-17 17:40:42 +04:00
Mieszko Jędrzejczak 1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Krausus 3aa007a1c7 Pet slime tweaks 2017-01-14 17:38:08 -05:00
Markolie f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
 2017-01-11 23:11:29 +01:00
uraniummeltdown c4033a85bd added category for atmos consoles 2017-01-11 09:56:16 +04:00
Markolie 46813b285e Adds the Voice of God, fix up font-size CSS 2017-01-07 23:43:32 +01:00
Fox McCloudandGitHub e17939388b Merge pull request #6065 from Crazylemon64/nullprefs_logging 
Safeguards against null-prefs clients from muting everyone
 2017-01-06 08:10:37 -05:00
Crazylemon64 ba08f54f08 Adds a wrapper proc that makes the null prefs datum bug not kill talking 
A null prefs datum is still logged, so that we are able to isolate the
source of the problem, though
 2017-01-02 19:26:30 -08:00
Crazylemon64 f954382619 Adds a ui_key arg to ui_data 2016-12-31 12:51:07 -08:00
Fox McCloudandGitHub 5a01a6c7d3 Merge pull request #5840 from Crazylemon64/adds_reset_perspective 
Polishes up `reset_view`
 2016-12-23 07:27:36 -05:00
Crazylemon64 6d3e66f41c Polishes up the reset_view proc, which is basically 
`reset_perspective` from tgstation.

Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things

Recommit because we're using different compiler versions
 2016-12-21 17:56:57 -08:00
Tigercat2000 b9abce843d NanoUI Update: Seperate UI Data into ui_data() proc 
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.

To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
 2016-12-14 13:37:34 -08:00
Fox McCloudandGitHub 288483ee52 Merge pull request #5838 from Markolie/grammarnazi 
Fixes
 2016-11-05 01:12:41 -04:00
Crazylemon64 3cdfbbe352 Fixes a couple incorrect research prereq specifications 2016-11-04 12:24:32 -07:00
Markolie 182cd3a0de Fix catwalk/plating issue, update Experimentor grammar and remove disabilities from nuke ops 2016-11-02 13:17:35 +01:00
Crazylemon64 6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Fox McCloudandGitHub dfde050407 Merge pull request #5644 from GeneralChaos81/Conveyors 
Port of TGs conveyors
 2016-10-11 20:27:46 -04:00
Crazylemon64 11a37ae960 Should make the rnd console less prone to freezing 
"wait_message" is now guaranteed to be unset provided that the timer
controller doesn't go down, and it'll be reset anyways by the `spawn` if
nothing runtimes in there
 2016-09-27 14:12:15 -07:00
Crazylemon64 deb5c01038 SMES and Borg coolers can now be made again, R&D maxing works again 2016-09-19 16:33:06 -07:00
Crazylemon64 fb291bec3f Ports tg's associative-list research datums 2016-09-14 20:38:21 -07:00