Commit Graph
100 Commits
Author SHA1 Message Date
TrilbyspacecloneandGitHub b8c753d642 Update fermi.dm 2020-12-13 11:33:06 -05:00
TrilbyspacecloneandGitHub 282251b834 Zeolites 2020-12-13 09:09:52 -05:00
TrilbyspacecloneandGitHub 366a605915 Update weldingtool.dm 2020-10-29 10:53:45 -04:00
TrilbyspacecloneandGitHub a837af1436 Update weldingtool.dm 2020-10-28 12:37:50 -04:00
bb155f8784 Apply suggestions from code review
Grammar

Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2020-10-24 07:25:27 -04:00
TrilbyspacecloneandGitHub 76a046b97a Update clothesmate.dm 2020-10-21 11:39:49 -04:00
TrilbyspacecloneandGitHub 917dfdd403 Update alcohol_reagents.dm 2020-09-05 10:38:32 -04:00
TrilbyspacecloneandGitHub da641c9b96 Update necropolis_chests.dm 2020-08-30 02:10:59 -04:00
TrilbyspacecloneandGitHub 9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
TrilbyspacecloneandGitHub c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
TrilbyspacecloneandGitHub 1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
TrilbyspacecloneandGitHub 4ea05ab07e Update drink_reagents.dm 2020-08-04 09:33:05 -04:00
TrilbyspacecloneandGitHub dc4d83d2db Update necropolis_chests.dm 2020-08-03 11:06:00 -04:00
TrilbyspacecloneandGitHub e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
TrilbyspacecloneandGitHub b3fea77468 Update necropolis_tendril.dm 2020-08-03 10:45:01 -04:00
TrilbyspacecloneandGitHub 0ec756cce6 the all crate 2020-08-03 10:43:58 -04:00
TrilbyspacecloneandGitHub ccca78a1ca Update spellcard.dm 2020-07-28 00:34:32 -04:00
TrilbyspacecloneandGitHub 3a6d72af54 Update spellcard.dm 2020-07-28 00:20:14 -04:00
TrilbyspacecloneandGitHub c8fff28395 Update spellcard.dm 2020-07-28 00:12:00 -04:00
TrilbyspacecloneandGitHub 062d514ac2 Update legion.dm 2020-07-07 14:30:09 -04:00
TrilbyspacecloneandGitHub b2dd2a1053 Update necropolis_chests.dm 2020-07-07 14:28:40 -04:00
TrilbyspacecloneandGitHub 023dcc0019 Update spellcard.dm 2020-07-07 14:22:41 -04:00
TrilbyspacecloneandGitHub ddeb564c80 Legion fix 2020-07-07 14:21:16 -04:00
TrilbyspacecloneandGitHub f479a8622e Update spell_book.dm 2020-07-07 14:11:46 -04:00
TrilbyspacecloneandGitHub c21011c64c Update spellcard.dm 2020-07-07 14:09:31 -04:00
TrilbyspacecloneandGitHub f7dbce0cd0 Update spellcard.dm 2020-07-07 13:55:02 -04:00
TrilbyspacecloneandGitHub dae3110100 Update wand.dm 2020-07-07 13:52:41 -04:00
TrilbyspacecloneandGitHub 8aceeb0c43 Update spell_book.dm 2020-07-07 13:50:42 -04:00
49b0d38112 Apply suggestions from code review
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-07-07 13:47:56 -04:00
TrilbyspacecloneandGitHub 4e1817d2be why were these tabs? 2020-06-17 03:22:29 -04:00
TrilbyspacecloneandGitHub 4d9eeae268 Update necropolis_chests.dm 2020-06-17 03:08:52 -04:00
TrilbyspacecloneandGitHub 51da7dfa71 Merge branch 'master' into spike-loot-differentces 2020-06-17 02:36:52 -04:00
TrilbyspacecloneandGitHub 8f35795971 Update autobotter_designs.dm (#12543) 2020-06-16 08:25:21 -07:00
TrilbyspacecloneandGitHub d7fd26c2a9 Moves decal painting from BEPIS into venders (#12393)
* Update bepis.dm

* Update assist.dm

* Update engivend.dm

* Update youtool.dm
2020-06-14 23:04:51 -07:00
TrilbyspacecloneandGitHub f42994c79b Toxin tweaks! Just storage (#12363)
* Toxin tweaks

* bepis readd

* paintings

* Update DeltaStation2.dmm

* Fixed
2020-06-09 05:34:22 -07:00
TrilbyspacecloneandGitHub 51189d7a04 of copper and gold 2020-06-09 08:00:01 -04:00
TrilbyspacecloneandGitHub 81070b8ada New fermi chem Zeolites! (#12428)
* Zeolites!

* No loner hs debug numbers...
2020-06-09 03:25:40 -07:00
TrilbyspacecloneandGitHub 6cf4985360 Update large_objects.dm 2020-06-08 01:09:27 -04:00
TrilbyspacecloneandGitHub abaf633ab9 Update large_objects.dm 2020-06-08 01:09:06 -04:00
TrilbyspacecloneandGitHub a2c4b741ad ahaha what if they didnt heal? 2020-06-04 21:46:38 -04:00
TrilbyspacecloneandGitHub 0b0e9011a7 Prevent surgery tools and items from being rad contaminatable (#12413)
* Update tools.dm

* Update tools.dm

* Update robot_modules.dm
2020-06-04 15:56:15 -07:00
TrilbyspacecloneandGitHub 6db076c42f Lowers the slowdown on snow tiles (#12404)
* Update fancy_floor.dm

* Update fancy_floor.dm
2020-06-04 15:52:30 -07:00
TrilbyspacecloneandGitHub d1a80ca2d7 Ghommie requested change 2020-06-03 20:29:17 -04:00
TrilbyspacecloneandGitHub f926dd7f5e Update pockets.dm (#12421) 2020-06-02 15:29:51 -07:00
TrilbyspacecloneandGitHub 916a1ab349 Update objective_items.dm (#12420) 2020-06-02 23:37:05 +02:00
TrilbyspacecloneandGitHub 02f467654e Adds a few more usefull tips (#12266)
* Update tips.txt

* Update tips.txt
2020-05-24 13:05:47 -07:00
TrilbyspacecloneandGitHub fcb2b58664 Upgrade able Medical bot and Floor bot as well! + Clean bot fix! (#12112)
* Misstake are now

* Still dosnt all work

* no more range upgrade it just dosnt work

* bithell

* a this
2020-05-20 19:03:20 -07:00
TrilbyspacecloneandGitHub b43a2861b6 Update watertank.dm (#12283) 2020-05-20 18:47:41 -07:00
TrilbyspacecloneandGitHub 7337993d8e Lavaland Gear Tweaks - Armor balancing (#12270)
* lava land tweaks

* Reverts Exo suit touches

5% isnt worth that much, so might as well give it back

* Update miscellaneous.dm

* Reverts the ERT based gear
2020-05-20 18:47:30 -07:00
TrilbyspacecloneandGitHub 42e6fccde0 Buffs space heaters (#12241)
* Update spaceheater.dm

* Update spaceheater.dm
2020-05-18 02:31:31 +02:00
TrilbyspacecloneandGitHub fa8351ebd1 Update dinnerware.dm (#12276) 2020-05-18 00:13:26 +02:00
TrilbyspacecloneandGitHub 2e1cc498a3 corrects WT-550 ammo to state 32 rather then 20 (#12275) 2020-05-17 01:05:24 +02:00
a71c282dac Makes assistant hivelords less wired (#12256)
* Update hivelord.dm

* Update hivelord.dm

* Update hivelord.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-17 01:04:25 +02:00
TrilbyspacecloneandGitHub b21fb97bda Some fixes, some addtions some harm - Ice box changes (#12147)
* Some fixes, some addtions some harm

* Update icemoon_surface_engioutpost.dmm
2020-05-15 07:54:25 -07:00
TrilbyspacecloneandGitHub c6c4d61ee3 Cargo Rework - MK *why did I ever lison to people that were just powergamers?* (#11975)
* Baby wheels off

* Oh god factorio is dead!

* Gas-p the nerfs!

* Update gear.dm

* tools

* Update large_objects.dm
2020-05-15 03:57:28 +02:00
TrilbyspacecloneandGitHub af0d1da409 Nerfs Drake Armor (#12133)
* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm
2020-05-15 03:40:13 +02:00
TrilbyspacecloneandGitHub f0cf2f8cfa Ports commit "fixes space vines" by AnturK (#12254)
* Update spacevine.dm

* Update spacevine.dm
2020-05-14 15:07:32 +02:00
899c5a4575 Corrects evey storge with storage (#12220)
* Update medical.dm

* Update autobottler.dm

* Update autobotter_designs.dm

* Update medical_designs.dm

* Update hardsuit.dm

* Update code/modules/cargo/bounties/medical.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-13 21:21:11 +02:00
871361936c Replaces mosins in russian crates with 10mm surplus rifles (#12176)
* Update security.dm

* Update armory.dm

* desc

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-13 05:35:01 +02:00
TrilbyspacecloneandGitHub 11f3d19edf brute force 2020-05-12 15:02:37 -04:00
TrilbyspacecloneandGitHub c5c11a7937 i hope we use PENDAS 2020-05-12 14:53:06 -04:00
TrilbyspacecloneandGitHub 72fbd8ec87 6 rather the 4 miss-keyed 2020-05-12 14:27:32 -04:00
TrilbyspacecloneandGitHub 88394151d8 Update research.dm 2020-05-12 14:22:05 -04:00
TrilbyspacecloneandGitHub 95330e4baf Update life.dm 2020-05-11 17:17:04 -04:00
TrilbyspacecloneandGitHub c14197bd1b Update life.dm 2020-05-11 17:16:10 -04:00
TrilbyspacecloneandGitHub 0df3483d6f Update life.dm 2020-05-11 17:15:29 -04:00
TrilbyspacecloneandGitHub 8fa1a0ba58 Update life.dm 2020-05-11 15:48:01 -04:00
TrilbyspacecloneandGitHub 720abbf1c5 Update life.dm 2020-05-11 15:21:49 -04:00
TrilbyspacecloneandGitHub 1e5cce73d9 Update life.dm 2020-05-11 15:19:39 -04:00
TrilbyspacecloneandGitHub db87da599c Update firstaid.dm 2020-05-11 08:41:03 -04:00
TrilbyspacecloneandGitHub 3c87647fd2 Update firstaid.dm 2020-05-11 08:32:36 -04:00
b019915d10 Removes alien crate adds ape crate (#12178)
* Update science.dm

* Update snacks_meat.dm

* Update science.dm

* Apply suggestions from code review

kinda didnt want to just take tg's ape cubes but what ever

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-11 01:10:45 +02:00
TrilbyspacecloneandGitHub b6fd7f18e2 Update large_objects.dm 2020-05-09 19:22:42 -04:00
TrilbyspacecloneandGitHub 0c630be04d Add files via upload 2020-05-09 19:16:33 -04:00
TrilbyspacecloneandGitHub 2c5819d5fe Delete monitors.dmi 2020-05-09 19:14:50 -04:00
TrilbyspacecloneandGitHub 43f6acd81b *crys* 2020-05-08 15:42:35 -04:00
TrilbyspacecloneandGitHub a711f312ce Update mecha_construction_paths.dm 2020-05-08 15:37:17 -04:00
TrilbyspacecloneandGitHub c9f8f55945 Update mecha_construction_paths.dm 2020-05-08 15:29:20 -04:00
TrilbyspacecloneandGitHub e0d56363d4 Update mecha_construction_paths.dm 2020-05-08 15:13:13 -04:00
TrilbyspacecloneandGitHub 5ab1d04154 Update mecha_construction_paths.dm 2020-05-08 14:44:27 -04:00
TrilbyspacecloneandGitHub 9caa236e85 Update mecha_construction_paths.dm 2020-05-08 14:22:15 -04:00
TrilbyspacecloneandGitHub 1472ea31a0 oops all the missing commas 2020-05-08 07:19:03 -04:00
TrilbyspacecloneandGitHub b5010c5cfc Update machine_vending.dm 2020-05-08 06:49:26 -04:00
TrilbyspacecloneandGitHub a6bf258f5c Update ice_demon.dm 2020-05-08 04:33:40 -04:00
TrilbyspacecloneandGitHub 80687bb17f Update recipes_misc.dm 2020-05-07 18:00:50 -04:00
TrilbyspacecloneandGitHub 86fc39a777 le sigh 2020-05-07 17:55:25 -04:00
TrilbyspacecloneandGitHub 106fb6496e Update hypospray.dm 2020-05-06 05:30:54 -04:00
TrilbyspacecloneandGitHub e33087cbf2 corrects vending tackler gloves 2020-04-26 22:06:35 -04:00
TrilbyspacecloneandGitHub 89bb18fe98 Update belt.dm 2020-04-25 00:50:03 -04:00
TrilbyspacecloneandGitHub 83ba5c1b9b Update venus_human_trap.dm 2020-04-23 16:52:24 -04:00
TrilbyspacecloneandGitHub 3e0519455a Update sylvan.dm 2020-04-23 03:34:38 -04:00
TrilbyspacecloneandGitHub 8bcdbf5fc6 Update weaponry.dm 2020-04-23 03:29:26 -04:00
TrilbyspacecloneandGitHub f1a5ba0754 wew 2020-04-23 02:28:16 -04:00
TrilbyspacecloneandGitHub b0e8c90531 Update spacevine.dm 2020-04-23 02:19:04 -04:00
TrilbyspacecloneandGitHub 511465ed7b Update shields.dm 2020-04-22 18:13:09 -04:00
TrilbyspacecloneandGitHub 6a99c3b2c0 oops all the ) 2020-04-22 18:07:13 -04:00
TrilbyspacecloneandGitHub 3418fe1541 Update weaponry.dm 2020-04-22 17:32:35 -04:00
TrilbyspacecloneandGitHub 71e91a15b1 toxin healing bad I guess 2020-04-22 02:19:35 -04:00
TrilbyspacecloneandGitHub 6dd89ec1e0 Update pockets.dm 2020-04-20 21:50:25 -04:00
TrilbyspacecloneandGitHub e769d28a2d Update weaponry.dm 2020-04-20 18:47:18 -04:00