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
31,076 Commits 8 Branches 0 Tags
aa1be3edad8aef0c20f690c31157d110af9e10c9
Commit Graph

23207 Commits

Author SHA1 Message Date
GinjaNinja32
72e32eeed9 Fixes, change underlay icons to fit with glass icon style 2016-06-07 17:41:25 +01:00
Yoshax
3211ca961b Makes coffee cups somewhat work 2016-06-07 16:35:29 +01:00
Datraen
94a0e186af Now stores seeds properly by checking names and assigning names on storage, instead of just putting them all under "Fruit" 2016-06-06 22:38:09 -04:00
Datraen
fe7c079747 Merge pull request #1879 from SpadesNeil/revert-ammo-fix-p90 
Reverts ammo change, fixes P90, changes SVD mag name
 2016-06-06 22:17:01 -04:00
Spades
e51da6c35b Renamed SVD mag to be consistent per request. 
It's just a 10 round 762 magazine. It's compatible with the STS.
 2016-06-06 22:03:03 -04:00
Anewbe
3fec6418dc Eyes and cells don't require research 2016-06-06 19:47:54 -05:00
Anewbe
1d04b9ca1f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into fbp_sans_science 2016-06-06 16:39:59 -05:00
GinjaNinja32
debfd3dabf Ports GinjaNinja32's drinks rewrite from Bay 2016-06-06 20:33:11 +01:00
Datraen
24d5769b02 Merge pull request #1880 from PolarisSS13/05_Jun._Increase_snowflake 
Increases loadout points
 2016-06-06 11:46:28 -04:00
Anewbe
a7deb7e6aa Removes the science requirements from creating prosthetic torsos and heads 2016-06-05 22:16:50 -05:00
Spades
baf8ca5dcc These were supposed to be removed. 
We scrapped this change.
 2016-06-05 22:24:35 -04:00
Spades
3b44024e88 Reverts ammo change, fixes P90 2016-06-05 17:55:39 -04:00
Jon
941aadae53 Increases loadout points 10 -> 15 to account for the steady increase in items, especially those that most people want to take anyway like lunchboxes and communicators. 2016-06-05 22:44:16 +01:00
Datraen
a5c615cbd1 Merge pull request #1872 from Anewbe/energy_burst_change 
Tweaks FM-2t to possibly be usable
 2016-06-05 13:58:32 -04:00
Spades
f6497ee60d Changelog says I changed this but I didn't. 2016-06-05 13:40:37 -04:00
Datraen
fa74226e99 Merge pull request #1844 from SpadesNeil/GunsGunsGuns 
Guns, Guns, Guns (Now in a PR less stupid)
 2016-06-05 13:25:26 -04:00
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
Neerti
4fec35ab91 Merge pull request #1873 from Yoshax/mapchanges 
Robotics slight adjustments
 2016-06-04 11:24:50 -04:00
Yoshax
ac3a1bd691 Robotics slight adjustments 2016-06-04 15:08:01 +01: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
56b35a9528 icon update 2016-06-04 00:31:15 -04: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
15f555b0fa Okay I lied. One more commit before a dev sees. 
Soviets aren't in your lore.
 2016-06-03 21:07:56 -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
EmperorJon
fc8af33bec Merge pull request #1859 from Datraen/SmarterStorage 
Brings SmartFridges under the vending machine datum system.
 2016-06-03 14:16:23 +01: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
Broseph Stylin
97a94af41a Fixes mapped-in double beds being made of steel and lacking padding. 2016-06-03 02:36:27 -03: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
Leshana
d002e5a3e7 Add a unit test which verifies all research designs' materials lists and chemicals lists contain only valid materials and reagents. 2016-06-02 18:37:37 -04:00
Yoshax
574f96639a Merge pull request #1860 from Datraen/XenobioUpdate5 
Xenobio Update #5
 2016-06-02 23:32:42 +01:00
Datraen
fbb0f764d2 Adds a missing (src) 2016-06-02 18:12:21 -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
Datraen
c5b2a6f708 Brings SmartFridges under the vending machine datum system, with tweaks. 2016-06-02 17:46:58 -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
Neerti
b160f369ea Merge pull request #1855 from Datraen/SparkQdel 
Gives sparks a chance to qdel.
 2016-06-02 14:51:57 -04:00
Datraen
be4a51eae8 Puts the qdel in initialize. 2016-06-02 14:36:53 -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