cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 21:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,410 Commits 8 Branches 0 Tags
78e9cb2123b8fb1bcd492560fbdcb77e00a82cc0
Commit Graph

194 Commits

Author SHA1 Message Date
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Nadyr
f9f0b60bc5 Update misc.dm 2021-01-07 22:29:39 -05:00
Nadyr
ca1eedb24e Update misc.dm 2021-01-07 22:24:37 -05:00
Chompstation Bot
601c842d13 Added Drakeborgs for sillicons along with plushies 2021-01-06 19:52:47 +00:00
Nadyr
cdc8abcbb9 Update misc.dm 2021-01-03 21:38:36 -05:00
Chompstation Bot
d96a127b4a Ports Vox Plushie from Paradise 2020-12-26 01:59:20 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Killian
498debf5d3 new crate spawner 
adds a new spawner that can spawn a random empty crate, a random crate with loot, or sometimes just nothing.
 2020-09-22 12:23:28 +01:00
Braiden
c55ea87e94 Merge branch 'kbraid.edit/additions' of https://github.com/KBraid/YWPolarisVore into kbraid.edit/additions 2020-09-19 03:03:11 -05:00
Braiden
71266ace1e added new plushies to drop lists 2020-09-19 03:03:09 -05:00
Killian
ce327dd9de More Spawner Stuff (#7631) 
* Update spacesuits.dm

* more random stuff

* even more random stuff, plus changelog

* random large, couple more odds & ends

* more tweaks

* More Spawners
 2020-09-11 03:12:22 -04:00
Killian
c7242b59de Update Random Spawners (#7614) 
* Update spacesuits.dm

* more random stuff

* even more random stuff, plus changelog

* random large, couple more odds & ends

* more tweaks
 2020-09-05 10:26:14 -04:00
Atermonera
ac824e6bfc The great Aurora shoe heist 2020-08-25 19:17:10 -04:00
Novacat
16465b5618 Merge pull request #8728 from VOREStation/upstream-merge-7466 
[MIRROR] Adds wearing cones and caution signs
 2020-08-21 13:33:08 -04:00
listerla
c63d6c5777 Adds wearing cones and caution signs (#7466) 
* Adds wearing cones and caution signs

* Fixes quarantine shuttle PoI

* Create Lorilili - janiwear.yml
 2020-08-17 12:59:40 -04:00
Rykka
5acb88413c Rename toy/mech to toy/mecha to match mecha code. 2020-08-12 20:08:05 -04:00
Rykka
a5fc9d81ce Adds Mech Toy Battles! 
Port of https://github.com/tgstation/tgstation/pull/51817

Adds a mech vs mech combat system for the toy mechs earned from arcades and found around the station. You can initiate combat with yourself by hitting a toy mech with another toy mech, or fight another player if you attack a player holding a mech with a mech.

Each mech has its own health stat and special ability that they'll use in combat against each other. How exciting!

Also slightly refactors toy locations and changes toy mechs from being JUST prizes to their own proper toy subtype!
 2020-08-12 04:31:00 -04:00
Atermonera
2830f4e35c Merge pull request #7390 from Cerebulon/schneemobs 
Adds some surface mobs.
 2020-08-06 14:22:46 -04:00
Heroman
00917e8e8b Adds a very familiar plushie 2020-07-31 19:07:45 +10:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Cerebulon
4a87460ba8 Flavour Enhancement: Crates 2020-07-21 22:20:30 -04:00
Cerebulon
f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -04:00
Novacat
23967ce999 Merge pull request #8379 from VOREStation/upstream-merge-7324 
[MIRROR] Add a random mech spawner (Not mapped in yet)
 2020-07-09 23:33:24 -04:00
Kates
e4389f170c Add a random mech spawner (Not mapped in yet) 2020-07-09 18:13:36 -04:00
Killian
9adf026d61 Update maintenance.dm 2020-07-09 04:43:32 +01:00
Killian
0ee78b5da3 balls: loot & vending 2020-07-04 22:50:14 +01:00
lbnesquik
856d48467a Introduce a SINGLE themed, colored explorer shield 
It is a simple hunk of metal, painted to a moody green or dangerous voidsuits purple and blacks.
It has a lower block chance than the real deal, but it is still a strong help against melee foes and the occasional beam or two. Do mind that those seem to be a lot squishier since the AI update.
And just like any tacticool object, it has a big flashlight stuck at the front to help with visibility, it's not like you can actually see much out of that slit.
You can order two for 80 points at cargo.
It actually starts in the pathfinder locker, meaning they decide whether or not it will be used.
 2020-06-11 04:14:54 +02:00
Atermonera
c8e5abc937 Random item spawners qdel properly on init without using sleep (#7134) 2020-05-15 16:36:09 -04:00
Aronai Sieyes
2c2e9c8e0d v e n d o t t 2020-05-14 22:29:16 -04:00
Novacat
de0bd4181a Merge branch 'master' into upstream-merge-7070 2020-05-03 11:37:30 -04:00
Aronai Sieyes
e9deffdefd Update mob.dm 2020-05-03 11:32:00 -04:00
Mechoid
8d328777b7 I love BYOND RNG, it is perfect and 100% reliable for testing. 2020-05-02 18:50:57 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Atermonera
0d80f24a5f Replaces toy waterflower with spraybottle waterflower (#6997) 2020-04-20 03:25:38 -04:00
Aronai Sieyes
d13d3d92fe Ports some plushies from Cit 2020-04-19 23:32:20 -04:00
Unknown
b5f337a3b0 Replaces Tramadol maint pills with Paracetamol 2020-02-16 10:54:55 -05:00
Heroman3003
718feb1ebe Adds pineapple pizzabox (#6682) 2020-02-13 17:11:43 -05:00
Heroman
38bf0a33c6 Fixes and re-implements Rogue Mining (Belt Mining) 2020-01-23 18:43:20 +10: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
caf274951c Implements ML-3M, Adds prototype NSFW 2019-09-17 11:24:58 +10:00
Unknown
d86972851a Whoops 2019-09-09 23:48:35 -04:00
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -04:00
Unknown
9467621800 Fixes some errors 2019-08-31 00:35:19 -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
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
if there were two guys on the moon
62b14805d5 adds ml3m to closets and stuff 2019-07-27 16:16:10 +01:00
if there were two guys on the moon
163ac56503 sprites and map fix 2019-07-22 23:20:00 +01:00
Heroman
c11a1fc16e Fixes spawning of action figures in crates. 2019-07-01 06:49:27 +10:00
Woodratt
8c3a430e8d June Map Adjustments 2019-06-18 13:34:12 -04:00