cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-05-22 22:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,974 Commits 8 Branches 26 Tags
e6f679d147c75a405b080aa41e5b64158366b114
Commit Graph

6793 Commits

Author SHA1 Message Date
Leshana 93cba6c326 Fix runtime in helper.dm,92 (#6706) 
Lists in byond are 1-indexed not 0-indexed.
 2020-02-19 01:26:05 -05:00
Aronai Sieyes 24ebfa36f1 Merge pull request #6581 from Heroman3003/pluspineapple 
Adds pineapple pizza to pizza voucher pool
 2020-02-18 14:08:53 -05:00
Unknown b5f337a3b0 Replaces Tramadol maint pills with Paracetamol 2020-02-16 10:54:55 -05:00
Heroman ae21ea53f5 AND DELETES ORIGINAL 2020-02-16 04:58:48 +10:00
Heroman 10e3dd6368 Moves falling datum for pizza delviery to voucher file 2020-02-16 04:58:32 +10:00
Heroman e162f75286 Adds pineapple pizza to pizza voucher pool 2020-02-16 04:55:40 +10:00
Arokha Sieyes 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Novacat 06b7651799 Update nanopaste.dm 2020-02-10 18:59:12 -05:00
Atermonera 6374108fa2 Applies same restrictions as first aid to external synth repair 2020-02-10 18:53:31 -05:00
Atermonera 0bbc8109ae Merge pull request #6675 from GeneriedJenelle/patch-1 
Logs graffiti and crayon drawings: Non-Cursed PR
 2020-02-09 23:45:06 -05:00
Atermonera 7b20362aaf Merge pull request #6662 from Shadow-Quill/Baton-Intent-Change 
Stunbatons will now only harmbaton on grab/harm intents
 2020-02-09 14:47:00 -05:00
Heroman b8c07ae29b Also applies taur riding teleport limitation to translocators 2020-02-08 13:35:41 +10:00
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