cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 15:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,227 Commits 26 Branches 2 Tags
b00a8bf95a7590b04e2e5c00613671e374a8daa6
Commit Graph

757 Commits

Author SHA1 Message Date
Tigercat2000
dd79aaa967 Merge remote-tracking branch 'upstream/master' into to_chat 
Conflicts:
	code/game/machinery/door_control.dm
 2016-04-05 21:10:36 -07:00
FalseIncarnate
8a558a7c96 Merge Conflict 2016-04-05 19:26:30 -04:00
FalseIncarnate
40ee9bb99d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic 2016-04-05 19:15:11 -04:00
Tigercat2000
c72cc9606e Merge remote-tracking branch 'upstream/master' into to_chat 
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
 2016-04-05 15:54:48 -07:00
TheDZD
35f89251b3 Merge pull request #4100 from Fox-McCloud/sentience-potion-changes 
Sentience Potion Changes
 2016-04-05 18:37:57 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
Fox-McCloud
b7afdec18c defines 2016-04-04 17:01:03 -04:00
Fox-McCloud
aee239c6e5 Sentience Potion Changes 2016-04-04 04:45:13 -04:00
Fox-McCloud
3bd37ec757 Simple Animal Spawn Refactor 2016-04-04 00:30:10 -04:00
Tigercat2000
519992b5a9 Merge branch 'byond510' 
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
 2016-04-01 14:15:44 -07:00
Fox-McCloud
560eb17f9d Fully Re-Activates Disease1 2016-03-30 22:31:59 -04:00
Fox McCloud
d1765e0e14 Merge pull request #4019 from tigercat2000/disease1 
-tg- disease1
 2016-03-30 21:29:58 -04:00
Fox-McCloud
9127c357e9 further thingssssssssssssssssssssssss 2016-03-30 18:17:55 -04:00
Tigercat2000
917dc9ab54 Add PanDEMIC design datum 2016-03-30 10:58:24 -07:00
FalseIncarnate
b91740b19b Logic Gates 
Adds CONVERT Gates, for converting a signaler signal to logic or
vice-versa.

Restructured/renamed some of the new logic files
- Split up the logic_gates.dm file into three files
- mono_input.dm
- dual_input.dm
- converter.dm

Made the logic_gate machines auto-update their multitool menu when you
click the links

Made the logic gate circuit boards a product of the autolathe
- Take that science. Quit hogging all the boards, nerds.

Removed relative pathing from signaler.dm
 2016-03-30 02:21:10 -04:00
Fox-McCloud
c345b8a761 forcemove 2016-03-29 21:36:58 -04:00
Fox-McCloud
6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04:00
TheDZD
6c130db64b Merge pull request #3998 from Fox-McCloud/surgery-robotics 
Robotics Sterile Surgery
 2016-03-26 17:33:31 -04:00
Tastyfish
077395f606 Fixes Timestop 2016-03-26 08:37:50 -04:00
Fox-McCloud
035b11a1b6 Robotics Sterile Surgery 2016-03-25 14:07:34 -04:00
Fox McCloud
c32025e682 Merge pull request #3937 from Tastyfish/videocam 
Adds video cameras to autolathe
 2016-03-21 21:02:54 -04:00
Tastyfish
f62209028b Adds video cameras to autolathe 2016-03-20 11:30:37 -04:00
Fox-McCloud
42f494aa7e Design Transfer Blueprints Protolathe->Autolathe 2016-03-20 03:53:11 -04:00
Fox-McCloud
08c06782ee Can Make Cable Coils in Autolathes 2016-03-15 22:40:49 -04:00
Tastyfish
c3de0cf196 Removes picture frames 2016-03-14 04:35:35 -04:00
Fox McCloud
ee67a63aca Merge pull request #3841 from Crazylemon64/decloner_re_add 
Makes the decloner possible to create again
 2016-03-12 05:40:49 -05:00
TheDZD
bdf26d9910 Merge pull request #3832 from monster860/fuckyougit 
Spesspod Mining Laser - "Fuck You Git" edition
 2016-03-11 21:27:53 -05:00
monster860
f6ccfc9ae7 Merge branch 'master' into fuckyougit 2016-03-11 06:17:16 -05:00
Crazylemon64
bd2b5f11b6 Makes the decloner possible to create again 2016-03-10 23:27:50 -08:00
FalseIncarnate
474dbb6b82 Buildable Xenobotany Machines 
A long-requested feature, you can now build the two xenobotany machines
- Lysis-Isolation Centrifuge
- Requires 1 matter bin, 1 scanning module, and 1 console screen
- Upgrading the scanning module causes less degradation when extracting
genes, meaning seeds last longer
- Bioballistic Delivery System
- Requires 1 matter bin, 1 manipulator, and 1 console screen
- Upgrading the manipulator decreases the degradation caused by splicing
genes, meaning you can (theoretically) splice more onto a pack before it
fails
 2016-03-10 21:46:07 -05:00
monster860
f4191293eb Spesspod Mining Laser - Fuck You Git edition 2016-03-10 21:24:21 -05:00
TheDZD
c00b89e2af Merge pull request #3805 from Fox-McCloud/science-nerf 
Heavily Rebalances Science
 2016-03-10 19:16:38 -05:00
TheDZD
62afa9d6d3 Merge pull request #3791 from Fox-McCloud/goon-immersion-sounds 
Implements a Few Goon Sounds
 2016-03-09 17:08:05 -05:00
TheDZD
39335b9322 Merge pull request #3808 from Fox-McCloud/fixes 
Organ Related Fixes
 2016-03-09 17:01:50 -05:00
Fox-McCloud
bcb0496578 Organ Related Fixes 2016-03-09 05:41:42 -05:00
Fox-McCloud
3ac2f23377 Heavily Rebalances Science 2016-03-09 02:58:05 -05:00
Fox-McCloud
bc639a357c more sounds 2016-03-08 22:35:31 -05:00
TheDZD
4e47626af7 Merge pull request #3767 from Tastyfish/silence 
Tranquillité, Prospérité & Mimeré
 2016-03-08 19:32:29 -05:00
Tastyfish
0e0225b1ee Fixes several midround antag assignments not asking ghosts first 2016-03-07 03:03:45 -05:00
Tastyfish
d189d70f4a Adds tranquillite 
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
 2016-03-06 01:49:30 -05:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor 
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
 2016-03-04 19:51:50 -05:00
Fox-McCloud
bca54aae9e Experimentor Fixes 2016-03-04 08:31:32 -05:00
Crazylemon64
7e510dfdb6 Changing a person's appearance now works better 
Also fixes some problems on changing gender
 2016-02-29 19:31:29 -08:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
Tastyfish
aed9859b9a Fixes a bunch of things to not circumvent SetStun/SetWeaken/SetParalyse that has no business doing so. 2016-02-28 01:11:36 -05:00
FalseIncarnate
a4b1f361a5 Buildable Prize Counter Boards and Non-silent Rocks 
Fixes Prize Counter circuit boards not being listed in the circuit
imprinter despite having the required research levels

Fixes #3694
 2016-02-25 22:44:21 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Fox McCloud
433dde874a Merge pull request #3668 from Tastyfish/frames 
Adds picture frames
 2016-02-24 02:02:42 -05:00
TheDZD
e5dc058e21 Merge pull request #3658 from Regen1/firelasers 
Adds immolator laser gun
 2016-02-22 18:23:45 -05:00