cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,118 Commits 8 Branches 0 Tags
ad119f676daef3dbe6cb15d701f2651291fc0eaa
Commit Graph

1062 Commits

Author SHA1 Message Date
Arokha Sieyes
eb6f979fc0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync 
# Conflicts:
#	vorestation.dme
 2016-06-07 18:37:47 -04:00
Anewbe
3fec6418dc Eyes and cells don't require research 2016-06-06 19:47:54 -05:00
Anewbe
a7deb7e6aa Removes the science requirements from creating prosthetic torsos and heads 2016-06-05 22:16:50 -05:00
Spades
bd2dcfe956 Compile error fix. 2016-06-03 23:27:10 -04:00
Spades
aa2c74aef5 Replaced mobs with vore versions. 2016-06-03 22:57:51 -04:00
Leshana
e3c8dd18e3 Fixes a bad material discovered by the new unit test! 
* "mutagen" is a reagent, not a material; it goes in the chemicals list.
 2016-06-02 18:37:37 -04:00
EmperorJon
241c4714e9 Merge pull request #1847 from SinTwo/frame_fix 
Removal of /map/New()
 2016-06-02 02:10:39 +01:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
SinTwo
2d7d011d9e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into frame_fix 
Conflicts:
	maps/polaris-1.dmm
	maps/polaris-5.dmm
 2016-06-01 14:47:21 -04:00
SinTwo
5d25d72593 Frame Fixes 2016-06-01 14:32:56 -04:00
Datraen
a7abdb5c86 Merge pull request #1845 from Yoshax/preperationsforbigports 
Scheduler now uses btime, and other improvements
 2016-06-01 14:21:28 -04:00
Arokha Sieyes
80706b8e90 Readds power cells to exosuit fabs. 2016-06-01 13:25:32 -04:00
Yoshax
0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Arokha Sieyes
595d1f77f2 Merge pull request #261 from Arokha/sync 
Polaris Sync
 2016-05-31 21:22:43 -04:00
Arokha Sieyes
81748274af Merge pull request #258 from VOREStation/designs-unit-test 
Add a unit test which verifies research designs' materials lists
 2016-05-31 21:12:38 -04:00
Leshana
604770a557 Fixes a bad material discovered by the new unit test! 
* "mutagen" is a reagent, not a material; it goes in the chemicals list.
 2016-05-31 20:38:07 -04:00
Arokha Sieyes
925b1b4a3e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	code/game/mecha/mech_fabricator.dm
 2016-05-31 18:17:58 -04:00
Arokha Sieyes
bf3b350ee3 Readd shrink ray, fix material requirement on ex drill 2016-05-31 18:10:30 -04:00
Arokha Sieyes
54272da167 Merge pull request #245 from VOREStation/sink 
Synchronize With Polaris
 2016-05-31 01:35:04 -04:00
Cameron653
d4c16be569 Adds in a language implant. 2016-05-30 16:59:57 -04:00
Arokha Sieyes
636bcd8745 Sad that I have to do this. 2016-05-30 02:36:58 -04:00
Arokha Sieyes
05f8a69821 Make FBPs Constructable 
Print 'em out, slap an MMI or Posibrain in. They come from a new machine, the Prosthetics Fabricator. You can order license discs from cargo to print the proprietary limbs. Making FBPs requires a bit of research as well, otherwise you only get arms/legs. Also requires a bit of plasteel to make the critical parts. Mostly just need every limb, plus eyes. Torso comes with the snowflakey FBP battery.

Also adds an FBP 'self-diagnostics' verb. More vague than an analyzer.

**This adds a machine that needs to be placed on the map. "/obj/machinery/pros_fabricator"**

Personally, I would replace the right-side exosuit fab with it. I can add this to my PR but I'm unsure how you guys feel about non-devs submitting map changes.
 2016-05-30 02:13:55 -04:00
Leshana
e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink 
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
 2016-05-29 16:22:07 -04:00
Leshana
3caec84482 Fix copy/paste error duplicating definition 2016-05-25 23:12:56 -04:00
Leshana
e37ac4da3e Fixes #145 - Makes jukeboxes constructable. 
* Adds circuit board.
* Adds design to print board on autolathe.
* Makes jukeboxes deconstructable back to frame.
 2016-05-25 21:35:24 -04:00
Cameron653
f7c7b5eb3a Removes pay bugfix 2016-05-23 14:06:06 -04:00
Cameron653
eb403b3d6d Rename finds_eguns_vr to finds_eguns_vr.dm 2016-05-22 18:05:48 -04:00
Cameron653
5836b2c8cb Create finds_eguns_vr 2016-05-22 17:48:58 -04:00
Cameron653
41a4cdd9d7 Fixes a typo 2016-05-21 00:29:39 -04:00
Cameron653
fbe0fcf5c5 Forgot to actually give it the equipped version! 2016-05-18 21:29:50 -04:00
Cameron653
982b972df6 Removes more redundancy. 2016-05-18 19:59:44 -04:00
Cameron653
21cf29a98a Removes redundant sleeping 2016-05-18 19:51:58 -04:00
Cameron653
06520d444f Xenoarch revamp, fixes icon bugs 2016-05-18 19:03:43 -04:00
Cameron653
ff16562d87 Nerfs the costs to make them and things required to make them 2016-05-18 17:32:34 -04:00
Cameron653
bb127db7e2 I forgot the vr 2016-05-18 17:29:43 -04:00
Cameron653
3b56e836c9 Makes Xenoarch Great Again 2016-05-18 17:28:18 -04:00
Cameron653
1793b9b318 Makes xenoarch pretty again. 2016-05-18 17:19:15 -04:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517) 
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
 2016-05-03 22:18:12 +01:00
EmperorJon
ebeaddea6e Merge pull request #1414 from Mark9013100/4/15/2016tank_grammar 
Fixes some punctuation
 2016-04-20 13:23:51 +01:00
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port 
Ports Bay's new inventory system.
 2016-04-16 02:58:07 +01:00
Mark9013100
06cff6d6af Fixes some punctuation 2016-04-15 01:01:58 -04:00
Neerti
469c01daf9 Manually ports Bay's volume inventory system. 2016-04-06 03:31:21 -04:00
Datraen
ca24446d7f Merge pull request #1287 from Kelenius/unitTests 
Ports unit tests
 2016-04-04 10:34:12 -04:00
Neerti
6d7b4bfd9f Corrects issue in cherrypicking. 2016-03-31 16:29:48 -04:00
Daranz
9837c098eb Further CallTechName() tweak 2016-03-31 16:11:42 -04:00
Daranz
baf49d0c23 Tweak CallTechName() 2016-03-31 16:11:13 -04:00
Daranz
2482ddf55a Resolve problem with robot destructive analyzer 
CallTechName() was borrowed from destructive_analyzer.dm for reuse in
the portable analyzer.

Resolves #12356
 2016-03-31 16:10:07 -04:00
Kelenius
c8b510b415 Adds unit tests 
Port of https://github.com/Baystation12/Baystation12/pull/11808 and
several others
Fixes three overlapping cables ([192 / 158 / 1], [214 / 161 / 1], [122 /
197 / 1])
Fixes drill and mech drill having the same ID.
 2016-03-29 17:42:22 +03:00
Yoshax
d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
Neerti
96e52f5af0 Merge pull request #1229 from SinTwo/construction_update 
Construction update
 2016-03-26 15:45:19 -04:00