cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-27 17:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,773 Commits 8 Branches 0 Tags
00a2acb48f3ffaf83a8ec5ee4f3752ab695844eb
Commit Graph

5031 Commits

Author SHA1 Message Date
Arokha Sieyes
3c5cfa838d Update sleevemate warning message 2020-02-04 20:16:13 -05:00
Atermonera
1f227a9b55 Merge pull request #6664 from PrismaticGynoid/loadouttoys 
Adds some toys to the loadout
 2020-02-03 20:50:45 -05:00
Atermonera
908489b1bd Merge pull request #6640 from TheFurryFeline/patch-5 
Aaaa, typo fixy
 2020-01-21 18:14:22 -05:00
Novacat
1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621 
[MIRROR] Moar descriptions for things
 2020-01-21 01:33:06 -05:00
Novacat
7b815bd594 Update radio.dm 2020-01-21 01:23:57 -05:00
Atermonera
d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Novacat
708e0b477e Merge pull request #6463 from VOREStation/upstream-merge-6619 
[MIRROR] Can now (de)construct chem masters
 2020-01-15 23:35:39 -05:00
Atermonera
7ae5204eaf Merge pull request #6619 from Shadow-Quill/Chem-Master-Building 
Can now (de)construct chem masters
 2020-01-15 23:16:19 -05:00
Atermonera
c50ef77161 Merge pull request #6612 from Shadow-Quill/PDA-Ctrl-Click 
Ctrl+Click now removes pens from PDAs
 2020-01-15 23:08:06 -05:00
drexample
041db96898 WE ALWAYS DELIVER 2020-01-11 23:22:18 +03:00
drexample
747114793c WE ALWAYS DELIVER! 2020-01-11 05:28:00 +03:00
Heroman3003
5f05d26eb9 Merge branch 'master' into resleeving_sickness 2020-01-10 09:43:42 +10:00
Heroman
a9c1f48a93 Adds a single cure pill to vault, doubles amount ERT gets, changes taste 2020-01-10 09:31:51 +10:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Heroman
e05fdf6258 Fixes clamp issues 2020-01-06 08:37:27 +10:00
Heroman
9490261230 Adds Kitsuhanan Cure for resleeving sickness 2020-01-06 07:15:13 +10:00
lbnesquik
377723bcf4 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-30 09:09:51 +01:00
Heroman
572112d28b Fixes AI not being able to resist out of nets 2019-12-29 08:33:10 +10:00
lbnesquik
562df07602 Move the lance sprite to weapons_vr.dmi. 2019-12-26 07:25:49 +01:00
lbnesquik
eace084579 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-26 07:25:05 +01:00
lbnesquik
ae398259ea Introduce more taur clothes. 
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
 2019-12-25 20:40:21 +01:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Atermonera
6b462af3ee Merge pull request #6569 from TheFurryFeline/TFF-Bulbs_Recycling 
Light Replacer QOL
 2019-12-21 14:31:10 -05:00
Novacat
0432002af7 Merge pull request #6327 from VOREStation/upstream-merge-6558 
[MIRROR] Change various global species lists to GLOB versions, adds 2 more event subspecies.
 2019-12-19 15:46:59 -05:00
Meghan-Rossi
ef7dfaa6cc Resolve conflicts, fix compile errors 2019-12-19 18:44:47 +00:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Atermonera
ef75d1c2a0 Clean up dead code obsoleted by outfit system 2019-12-16 00:51:16 -05:00
Novacat
dba6980b8d Merge pull request #6322 from VOREStation/upstream-merge-6567 
[MIRROR] EPv2 x Communicator fix.
 2019-12-15 23:36:47 -05:00
Novacat
8b541d00e3 Update messaging.dm 2019-12-15 23:27:50 -05:00
Atermonera
9ba1566211 EPv2 x Communicator fix. 2019-12-15 14:54:01 -05:00
Atermonera
838b6dce3e Merge pull request #6566 from Mechoid/MultitoolFix 
Fix Multitool Modes
 2019-12-15 14:52:47 -05:00
PrismaticGynoid
b22ec21911 Graffiti selection (#6562) 
* Lets you choose what type of graffiti or rune to draw when vandalizing the floor with crayons or markers. No more drawing and erasing a dozen times to get the exact graffiti you want.

* Puts in Mechoid's suggestion
 2019-12-13 20:37:14 -05:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Unknown
f42cd78de3 Fixes Elven Weapons 2019-12-06 19:14:35 -05:00
Unknown
192dd12e7f Attempts to fix Gladius 2019-12-06 18:59:35 -05:00
Unknown
9435f5720d Misc Tweaks Pt. 2 
- Slightly increases Centcom/Modified translocator energy costs
 2019-12-06 18:44:16 -05:00
Unknown
d8392dfe8b More updates 2019-12-06 18:24:18 -05:00
Unknown
a3c48e6eca how did that get deleted 2019-12-06 17:18:05 -05:00
Unknown
062d8ec39c Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes 2019-12-06 17:10:23 -05:00
Unknown
5499e3272f Miscellaneous fixes 
- Fixes holodeck eswords
- Fixes toy swords not showing the blade
- Temporarily disables vent sounds

Fixes #6265
 2019-12-06 17:10:13 -05:00
Novacat
e5c7d83aba Merge pull request #6222 from Novacat/nova-pathfinder 
Centcom/Tether Ship Changes
 2019-12-06 16:06:56 -05:00
Spades
f977f0988c Merge pull request #6267 from Verkister/yehaw 
Some more simplemob QoL and fixes.
 2019-12-06 10:54:40 -05:00
lolman360
e2b47484c8 Fixy-wixies the fucky-wucky I madey-wadey with toy swords. (#6526) 
* one

* rtwo

* image

* Update material_weapons.dm

* Update toys.dm

* Revert "Update material_weapons.dm"

This reverts commit 1a37bb015a5e503a4c5f0433bc279f15514319a7.

* Revert "image"

This reverts commit 6496dd404d0eb740e158fbc94322f6944f508886.

* Revert "rtwo"

This reverts commit 3b7aacd6c830e52986f2a34abf5b5ccbfbb135f8.

* Revert "one"

This reverts commit 324d188058c0a824c0259e2d6b98f69e563846bd.

* Update toys.dm
 2019-12-05 18:29:06 -05:00
Verkister
cee26ffa2e Some more simplemob QoL and fixes. 
-Fixes mob radio headset. Now actually hearable and able to be properly put into the mob.
-Makes a bunch of voremobs start with darksight enabled.
-Makes at least the mountable mobs remove the redundant movement cooldown on player control presence.
-Makes some formerly mountable mobs mountable again. (deathclaw, dragon, hippo, horse, panther, rat)
-Snips some redundant the's out of the petting resposes. (No more player pets the the mob)
 2019-12-01 12:51:18 +02:00
Novacat
c8b277096e Merge pull request #6261 from VOREStation/upstream-merge-6547 
[MIRROR] Lamps, Lights, Lackluster!
 2019-11-29 20:27:36 -05:00
Anewbe
068e132603 Merge pull request #6547 from TheFurryFeline/TFF-Lamps_Lights_Lackluster 
Lamps, Lights, Lackluster!
 2019-11-29 19:51:34 -05:00
Anewbe
12d5118ecc Merge pull request #6550 from listerla/grammar-time 
Fixes two typos (rengeration and Extranneous)
 2019-11-29 19:49:14 -05:00
Unknown
200cb2f5af Enables all channels by default 2019-11-28 14:31:15 -05:00
Unknown
199fffc2d0 Refactors translocators a bit more 2019-11-28 14:22:56 -05:00