cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,322 Commits 8 Branches 0 Tags
dbe19bdbd3d72074b51c684eda086e3513f7897c
Commit Graph

14745 Commits

Author SHA1 Message Date
Spades
9da3e9bac7 Comment corrections to clear confusion. 2016-06-05 13:18:07 -04:00
Datraen
45e71a1825 Merge pull request #1871 from SinTwo/power_monitor_fix 
Power monitor fix
 2016-06-05 10:53:14 -04:00
Anewbe
ecc902a811 Removes species restrictions on shoes and gloves for Taj and Unathi 2016-06-04 16:05:05 -05:00
Spades
037271504e No five-round burst! I thought I removed these! 2016-06-04 01:36:56 -04:00
Anewbe
cdb5966576 Tweaks FM-2t to possibly be usable, fixes its single-shot mode, too 2016-06-03 23:58:00 -05:00
SinTwo
dc29227895 Fixes power monitor computer screens 2016-06-03 22:10:52 -04:00
Arokha Sieyes
15fdb5eb1b Synth gets hit by axe? Internal bleeding. 
That'sa-no-good.
 2016-06-03 21:18:24 -04:00
Spades
c173d0dbb7 The last commit. 2016-06-03 21:01:53 -04:00
Spades
23e609ccb3 Fuckit. Silenced sound can go. It's unrealistic anyway. 
I could have fixed it but meh.
Also map cleanup.
 2016-06-03 20:37:05 -04:00
Spades
700b8b5934 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 
# Conflicts:
#	code/modules/projectiles/gun.dm
 2016-06-03 20:29:19 -04:00
Spades
a063c8915e Feedback based on meeting. 
- Removed carbine from the cargo.
- Removed SVD.
- Removed FiveSeven. Added sprite to gun resprites.
 2016-06-03 20:21:12 -04:00
Spades
09788190c2 Reverted autolathe changes. 
Need to fix this exploit some other way, some other day.

Also fixed some oversights.
 2016-06-03 18:22:19 -04:00
Datraen
245b353375 Merge pull request #1726 from Yoshax/dnalockframework 
Adds a framework to allow guns to be locked to dna
 2016-06-03 17:25:17 -04:00
Spades
dd0c3935e7 Gun lore updates. 
Also changed the path of the bullpup rifle.
 2016-06-03 10:33:04 -04:00
Spades
e0748c8261 Response to feedback. 
Tried to make descriptions better.
SAW magazine no longer fits in pockets.
 2016-06-03 01:57:13 -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
Datraen
05caade93e Ensures slimes will have identically different trait datums when the cores are created. 
This does not account for VV modifications.
 2016-06-02 18:09:27 -04:00
Spades
0d5b943db7 Github client being stupid. Changed these names too. 2016-06-02 17:19:57 -04:00
Spades
c6b650afa5 Changed some new gun names based on feedback. 
People prefer fantasy names for modern guns! Left names like the Mosin
and Tommygun because they're too ironic to change, even in the 26th
century.
 2016-06-02 17:16:21 -04:00
Datraen
e62b06e867 Merge pull request #1856 from SinTwo/frame_fix 
Fixes fax runtimes at startup.
 2016-06-02 15:19:01 -04:00
SinTwo
1b80af361e Fixes fax runtimes at startup. 2016-06-02 15:10:33 -04:00
Spades
093ab24339 Few quick fixes 
- Fixes shotgun magazine icon.
- SAW uses correct sound.
- Shotgun revolver uses correct sound.
- Mosin has a back sprite now. Placeholder.
 2016-06-02 14:32:37 -04:00
Yoshax
1980d2c741 Merge pull request #1853 from Datraen/XenobioUpdate4 
Xenobio2 Update #4
 2016-06-02 19:25:04 +01:00
Arokha Sieyes
63bf71e393 Sanitizing text twice breaks quotes 
Someone didn't read the comment in text.dm helpers, I see. This text is sanitized 2 lines above. Don't do it twice, nothing changed.

Fixes https://github.com/VOREStation/VOREStation/issues/276

(Do cross-repo magic-word closes work? _We're about to find out!_)
 2016-06-02 14:12:48 -04:00
Spades
736c8c132c Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-02 13:01:45 -04:00
Datraen
e6a90dbe6b Tweaks scanner, trait acquisiton for slimes, trait application for all xenos. 2016-06-02 12:34:31 -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
Spades
a54e49fa73 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-01 15:16:53 -04: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
Spades
ff87150c3d Let's just have the one commit this time because I'm no longer paranoid of losing progress. 2016-06-01 12:48:48 -04:00
Neerti
3e3962c0a9 Merge pull request #1801 from Anewbe/more_hostile_mobs 
PUNCH SPIDERS, GET MONEY
 2016-06-01 00:37:46 -04:00
Yoshax
efe66153ab Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dnalockframework 
# Conflicts:
#	code/modules/projectiles/gun.dm
 2016-06-01 00:47:52 +01:00
Mechoid
7bcd041e09 Fixes overlay issue with ghosts when choosing sprites, and adds more sprites to choose from from popular demand. 2016-05-31 14:30:17 -07:00
Datraen
36d9cee0f7 Merge pull request #1806 from VOREStation/limbprinter 
Make FBPs Constructable
 2016-05-31 15:50:32 -04:00
Datraen
c75512aa75 Xenobio2 Update #3 (#1832) 
* Adds growth inspection to the trait scanner, lowers mutation and growth levels.

* Adds NutriMaxes to Xenobiology, for feeding the slimes.

* Fixes a typo
 2016-05-31 18:30:52 +01:00
Broseph Stylin
4518e22be2 Small update to double beds. (#1828) 
* Corrects a typo because I'm dumb.

* Adds double bed recipe to appropriate materials.
 2016-05-31 15:08:57 +01:00
Datraen
caac4c5838 Randomized Plant Update (#1805) 
* Plants now use a ban list instead of an approved.

This means that most reagents can be synthesized by plants.

Also added a name generator for strange seeds, based off of a bit of
lipsum and a bit of various plant genus and descriptors.

# Conflicts:
#	code/modules/hydroponics/seed.dm

* Removes # sign
 2016-05-31 15:08:42 +01:00
Mark9013100
d7624b2b15 Adds a few more accessories 2016-05-31 06:16:05 -04:00
Datraen
c1c3110496 Xenobio2 Update 
Adds the trait scanner, which I had thought was previously added.
Fixes the smartfridge not believing that it had the cores in it's inventory.
Fixes an inverted check.
 2016-05-30 23:44:53 -04:00
Mark9013100
9aecdce655 Adds more ties to loadout, strangulation not included 2016-05-30 17:00:31 -04:00
Spades
26c759c7ad Fixes #1813 (#1815) 2016-05-30 19:57:06 +01:00
EmperorJon
741706e9e3 Underwear + setup merges (#1812) 
* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
 2016-05-30 19:19:45 +01:00
Arokha Sieyes
636bcd8745 Sad that I have to do this. 2016-05-30 02:36:58 -04:00
Arokha Sieyes
2186afb094 Dem tags doe. 
Closed a </span> tag I forgot.
 2016-05-30 02:22:33 -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