cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 5 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

1760 Commits

Author SHA1 Message Date
Unknown
a5f3776a91 adds _vr to trash pile 2020-02-17 00:01:50 -05:00
Unknown
b5f337a3b0 Replaces Tramadol maint pills with Paracetamol 2020-02-16 10:54:55 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Novacat
22c0fd363f Update bed.dm 2020-02-08 15:56:26 -05:00
Meghan-Rossi
3935aa3e47 fix conflict causing compile error 2020-02-08 19:32:03 +00:00
Atermonera
c9e3257d17 2020 Civilian Wing Overhaul 2020-02-08 13:56:05 -05:00
Atermonera
80ec8ac200 Merge pull request #6656 from Amunak/countable-lists 
Prettifies closet contents list with (newly added) countable variant of english_list
 2020-02-01 18:01:23 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Unknown
d3aa3bed3c Removes gnomes 
https://cdn.discordapp.com/attachments/173832207784214528/666485419747180554/7f1b99fdd795299aabd6ddef202ecf98.png

This is why we cannot have nice things.
 2020-01-13 22:49:15 -05:00
Heroman
f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10:00
Novacat
c7b689246d Merge pull request #6423 from drexample/WE-ALWAYS-DELIVER 
DO YOU NEED A SLICE OF JOY IN YOUR LIFE?
 2020-01-12 22:14:17 -05:00
Novacat
105f13e03c Merge pull request #6424 from drexample/gnot-sure 
You've been gnomed.
 2020-01-12 22:02:41 -05:00
Heroman
06b5064a8e Makes drone pods remain active after first attempt, allowing a ghost to click on it to enter 2020-01-13 07:21:48 +10:00
drexample
041db96898 WE ALWAYS DELIVER 2020-01-11 23:22:18 +03:00
drexample
1be4fe8b3c hooh 2020-01-11 06:42:54 +03:00
drexample
747114793c WE ALWAYS DELIVER! 2020-01-11 05:28:00 +03:00
Heroman
b5f0e0affe Fixes wrong gasmask in xenoflorist locker 2020-01-11 10:39:08 +10:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Mechoid
c3079004ea GameMaster Tuning (#6593) 
* Actually Game Master but I am an idiot.
 2020-01-05 01:39:28 -05:00
lbnesquik
e772c1a09b Add ambrosia seed as a somewhat rare loot for trash. 
Why is this good:
- Low level illegal stuff to do
- I can make my pothead characters
- This is like the most common illegal drug ever, so having it being harder to get than size guns or basically anything in R&D is weird.
- What are you going to do with weed besides smoke it anyway?
 2020-01-03 22:47:32 +01:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Atermonera
eeb8310aa2 Fixes mech projectile armor thinking test projectiles are dangerous 2019-12-21 23:58:07 -05:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Novacat
e5c7d83aba Merge pull request #6222 from Novacat/nova-pathfinder 
Centcom/Tether Ship Changes
 2019-12-06 16:06:56 -05:00
Unknown
199fffc2d0 Refactors translocators a bit more 2019-11-28 14:22:56 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Mechoid
e1fa847bc2 Xenowork Prep For Future (#6491) 
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
 2019-11-04 21:38:02 -05:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Verkister
056799efe5 Makes stasis cages use the new sprites 
Turns out they were never a storage structure subtype to even begin with.
 2019-09-28 22:01:11 +03:00
Atermonera
4eb1e378f6 Merge pull request #6447 from TheFurryFeline/TFF-Orange_Is_The_New_Orange_Part_2 
Orange Is The New Orange Part 2
 2019-09-25 17:09:00 -04:00
Atermonera
7b126e37b7 Merge pull request #6404 from Heroman3003/flappening 
Makes airtight plastic flaps unmakeable
 2019-09-22 19:53:30 -04:00
Mewchild
7462847479 Ports Sofas from CitRP 2019-09-10 00:15:07 -05:00
Heroman
a1a395a1a9 Implements borg spawners 2019-09-06 16:27:51 +10:00
Donut
964cc0e2c1 Musician.dm Fix 
The person who did the port from TG flipped the defines around. Whoops.
 2019-08-31 10:53:47 -04:00
Unknown
0d73c8ad76 Early Polaris Ports 
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
 2019-08-30 23:55:58 -04:00
Heroman
af94e7f374 Fixes some mimic bugs 2019-08-26 10:29:41 +10:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Novacat
dfed56f83e Merge pull request #5615 from Michiyamenotehifunana/Toricrates-Remastered 
Resprites Crates (And stuff like the cargo tug)
 2019-08-19 17:07:23 -04:00
Michiyamenotehifunana
81c56fefd8 Makes Cargo Tugs Great Again (and a minor tweak) 2019-08-16 12:37:08 +08:00
Unknown
98fd57ae3c Final touches 2019-08-15 23:18:05 -04:00
Michiyamenotehifunana
6c8589fa4a Whoops I missed a bit 2019-08-15 22:45:30 +08:00
Michiyamenotehifunana
3a676ad02e Adds Toricrates and stuff 2019-08-15 22:22:28 +08:00
Atermonera
c9e9932182 Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange 
Freebie Orange Jumpsuit
 2019-08-12 14:40:23 -04:00
Novacat
d844f233c4 Merge pull request #5508 from VOREStation/upstream-merge-6279 
[MIRROR] Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.
 2019-07-30 19:50:02 -04:00
Heroman
54be18505b Removes the leaks and related mechanics 2019-07-31 09:25:07 +10:00
Andrew
e4deaa6478 Combat Mechs Can Punch More Things (#6303) 
* Combat Mechs Can Punch More Things

Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).

Gives punching objects a check so you don't accidently smash something without meaning to.

Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.

* Take_Damage Boogaloo

* More take_damage Stuff

Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.

More stuff can be broken by mech punch and simple mobs.

* Adds changelong

* usr to user
 2019-07-24 17:00:24 -04:00
Mechoid
5864447d5d Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my. (#6279) 
* Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.

* Fix processing fuckery.

* Deal with Forever-Seals, and Infini-clamps.

* Update clamp.dm
 2019-07-24 04:46:28 -04:00