cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 09:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,400 Commits 8 Branches 0 Tags
c99c1db0a1943d44e30f8a04aca04a8046b7659d
Commit Graph

23396 Commits

Author SHA1 Message Date
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
JoanRisu
180f5a3017 Added medals for these people: 
Dhaeleena:Dhaeleena M'iar
Vorrarkul:Lucina Dakarim
 2016-06-04 06:29:16 -07:00
JoanRisu
dabcd61aab SQUIRREL COMBAT SPACESUIT...along with the Bolt Action and M14. 2016-06-04 05:43:02 -07: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
Arokha Sieyes
3f47fe64b6 Merge pull request #291 from VOREStation/dev-Ace 
Replaces several mobs with vore versions
 2016-06-03 23:57:39 -04:00
Spades
481908203c Fuck off Travis. 2016-06-03 23:40:45 -04:00
Arokha Sieyes
f3a4cc0205 Merge pull request #295 from JoanRisu/Fluff_Items_worshop 
Fluff: Crescent Rose Revived!
 2016-06-03 23:40:28 -04:00
Spades
bd2dcfe956 Compile error fix. 2016-06-03 23:27:10 -04:00
JoanRisu
e7ddc06368 Rebuilt the Crescent Rose code and edited the custom swords because they were inheriting the wrong stats. 2016-06-03 20:21:12 -07:00
Arokha Sieyes
e6d767d309 mend 2016-06-03 23:15:09 -04:00
Spades
aa2c74aef5 Replaced mobs with vore versions. 2016-06-03 22:57:51 -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
Arokha Sieyes
307e261e72 Synth gets hit by axe? Internal bleeding. 
That'sa-no-good.
 2016-06-03 21:14:46 -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
Arokha Sieyes
02875c13da Fixed my own limbs. 
Herp derp.
 2016-06-03 20:44:27 -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
JoanRisu
6c41a1aa7a Prototype code for Crestrose, added code for scisword, and moved some fluff around. 2016-06-03 11:06:31 -07:00
Spades
f2d38db655 Merge pull request #279 from JoanRisu/Fluff_Items_worshop 
Fluff Items Workshop
 2016-06-03 10:54:47 -04:00
Spades
870c1d55ab Merge pull request #280 from VOREStation/custom-species-274 
Fixes Issue #274 - Preserves custom species when being cloned.
 2016-06-03 10:53:39 -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
dd4a11ad5a Fixes Issue #274 - Preserves custom species when being cloned. 2016-06-02 18:50:35 -04:00
JoanRisu
20cca897bc Quick syntax amendment because dream maker didn't catch it. 2016-06-02 15:50:25 -07: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
JoanRisu
f80f97e52f Code for new fluff items plus some sprite name amendments. 2016-06-02 15:37:16 -07: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
Datraen
804d69e965 Gives sparks a chance to qdel. 2016-06-02 14:31:20 -04:00