Hawk_v3
f36bda0ffd
Or is this the list fix? I can't read AWK and regex.
...
I know where the file IS, just...
2020-01-13 19:01:15 +00:00
Holdelta
9c7e1f82af
Fixing Travis formatting part 2
...
Adding a parenthesis at the end of a comment because Travis.
2020-01-12 15:44:47 -08:00
Hawk_v3
697641a913
Indentation Fix
...
Travis checks for proper closure. While this might not actually fix it, it's expecting to see ) at the end of the line, as I've run into this one before.
2020-01-12 23:30:34 +00:00
Holdelta
a306d5fd4e
Update engineering.dm
2020-01-11 23:34:21 -08:00
Holdelta
0624435524
Update engineering.dm
2020-01-11 23:32:56 -08:00
Hawk_v3
838f5e9418
Merge remote-tracking branch 'upstream/master'
2020-01-06 00:47:53 +00: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
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00: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
Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +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
Unknown
f68a82b81f
Replaces lentext with length
2019-12-12 13:13:18 -05:00
Repede
3c9731879a
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
2019-12-09 17:15:36 -05:00
Hawk_v3
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
Novacat
e5c7d83aba
Merge pull request #6222 from Novacat/nova-pathfinder
...
Centcom/Tether Ship Changes
2019-12-06 16:06:56 -05:00
Repede
9c61982751
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
...
# Conflicts:
# code/game/machinery/vending_yw.dm
# icons/vore/custom_clothes_yw.dmi
# vorestation.dme
2019-11-29 19:13:53 -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
Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00: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
Hawk_v3
2cc8800ede
Merge remote-tracking branch 'upstream/master'
2019-10-08 15:14:36 +01:00
Atermonera
89aad128cf
Blind port of Bay Radiation Subsystem
2019-10-06 03:30:36 -04:00
Hawk_v3
74cc210e21
Merge remote-tracking branch 'server/master' into map
2019-10-05 23:10:09 +01:00
Hawk_v3
691a1239f4
Merge from Vorestation
2019-09-29 21:53:09 +01: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
Hawk_v3
b22f2284fe
Merge remote-tracking branch 'upstream/master'
2019-09-23 20:55:18 +01:00
Atermonera
7b126e37b7
Merge pull request #6404 from Heroman3003/flappening
...
Makes airtight plastic flaps unmakeable
2019-09-22 19:53:30 -04:00
Hawk_v3
a333c03a3c
Merge remote-tracking branch 'upstream/release'
2019-09-14 17:10:36 +01: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
Hawk_v3
6d4ec50e08
Merge remote-tracking branch 'upstream/master'
2019-09-01 19:02:01 +01: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
Hawk_v3
0973c49633
Merge remote-tracking branch 'upstream/master'
2019-08-27 00:22:31 +01:00
Heroman
af94e7f374
Fixes some mimic bugs
2019-08-26 10:29:41 +10:00
Hawk_v3
0f3c802427
Merge remote-tracking branch 'upstream/master'
2019-08-22 21:32:01 +01: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
Hawk_v3
96b8a7ab95
Merge remote-tracking branch 'upstream/master'
2019-08-17 21:06:48 +01: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
