Commit Graph

20161 Commits

Author SHA1 Message Date
ComicIronic
53cd694db2 Fix merge conflicts. 2014-11-14 23:20:55 +00:00
ComicIronic
c7793843b5 Added plastic, fixed merge conflicts. 2014-11-14 23:18:21 +00:00
ComicIronic
da21325ee0 Added plastic sheets to map. 2014-11-14 23:14:17 +00:00
ComicIronic
a4f2168293 Added flatpack instructions. 2014-11-14 22:38:38 +00:00
d3athrow
161378456f Merge pull request #1903 from N3X15/fix-borers
Borer fixes
2014-11-14 16:31:24 -06:00
Rob Nelson
fabdf0cff1 Class rather than style. 2014-11-14 13:04:32 -08:00
Rob Nelson
632bc56429 Double-returns 2014-11-14 13:03:40 -08:00
Rob Nelson
a01578ee65 Redo changelog. 2014-11-14 12:50:39 -08:00
Rob Nelson
d886215735 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into fix-borers
Conflicts:
	html/changelogs/N3X15-fix-borers.yml
2014-11-14 12:49:35 -08:00
Rob Nelson
3e42e2a13b Borer fixes
```yaml
changes:
- rscadd: "Borers receive a brief instructional greeting and receive objectives."
- bugfix: "Borers and host brains can communicate properly now."
- bugfix: "Borer chat is propagated to ghosts and fellow borers properly."
- bugfix: "Borer chat is stripped of the beginning ;."
- bugfix: "Standardized borer vent-crawling, now uses same system as other vent-crawling mobs."
```
2014-11-14 12:46:46 -08:00
Rob Nelson
ec5066b376 Work 2014-11-14 11:45:49 -08:00
Chris
94475626dc Little bit more 2014-11-14 13:33:57 -06:00
Chris
7d37a1b053 Some work on metastation 2014-11-14 13:16:29 -06:00
ComicIronic
4cd07a07f0 Adjusted material generation values. Plastic is now fixed at ~10% of total cost.
Moved some procs relating to designs from rdmachines to designs.dm
2014-11-14 17:58:53 +00:00
Chris
ba41d35a96 Changelog 2014-11-14 11:52:48 -06:00
Chris
eb934f61bb Increase maturation rate of plants by 160% 2014-11-14 11:51:39 -06:00
DeityLink
9e7a697d97 Adminbus part2 2014-11-14 05:14:13 +01:00
Chris
9784e29eb9 Map voting 2014-11-13 22:05:30 -06:00
Chris
ca9f2a3887 Update tg-to-vg.txt with what i've learned. 2014-11-13 21:00:57 -06:00
d3athrow
8e21056f7a Merge pull request #1893 from dylanstrategie/Mapping
Re-introducing IratePirate's PR
2014-11-13 17:57:19 -06:00
d3athrow
14fbfd0072 Merge pull request #1899 from ComicIronic/NaziVendFix
Fixed vending inheritance and emagging.
2014-11-13 17:55:23 -06:00
ComicIronic
04d45bfbc5 WIP: Changing the balance designs of mechanic. 2014-11-13 23:30:15 +00:00
ComicIronic
61e59d2798 Fixed vending inheritance and emagging. 2014-11-13 23:21:16 +00:00
d3athrow
f8661c9f3d Merge pull request #1898 from N3X15/fix-borers
More borer fixes
2014-11-13 14:09:52 -06:00
Rob Nelson
6c5e7d8b90 changelog. 2014-11-13 11:35:27 -08:00
Rob Nelson
d5779f8a62 Borer PP fixes/enhancements. 2014-11-13 11:33:22 -08:00
Rob Nelson
c52099f422 Fix chemical synth and PP. 2014-11-13 10:54:34 -08:00
Rob Nelson
4fc5c81898 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into fix-borers 2014-11-13 09:37:25 -08:00
d3athrow
dbf9fbf60c Merge pull request #1892 from ComicIronic/MecchaCautery
Actually made edited mechanic code work
2014-11-13 09:49:59 -06:00
dylanstrategie
637d5c9626 Re-introducing IratePirate's PR
Since IratePirate's PR has reached a block, I'm redoing the most
common-sense changes and including an extra thing or two :

- Add in missing cameras to latest changes. I hope I got them all
- Fix broken conveyor belt corner in Cargo
- Fix some of the wires and pipes under walls, notably near Cargo and by
the vending machines near HoP Office
- Switch the General Fabricator windoor so that Mechanics get to control
who accesses it, but can still make it public at a moment's notice
- Add Air Alarm to Viro Access
- Added in some reinforced tables to Perma to make prisoner escape a bit
harder. You can no longer pillage Execution and unless someone snuck in
a welder you won't be able to pull off the Perma hallway strategy since
reinforced tables are now in the way. Pull something more intricate or
serve your sentence
2014-11-13 06:26:50 +01:00
DeityLink
09bf70457a Adminbus part1 2014-11-13 05:27:43 +01:00
Rob Nelson
98734f8c57 Fix borers going through welded vents 2014-11-12 19:16:39 -08:00
Rob Nelson
c453e8285f Fix give chem being blank 2014-11-12 19:12:43 -08:00
ComicIronic
9dd7db045a Actually made the edited code work. 2014-11-12 23:10:33 +00:00
d3athrow
a1b4df3e7f Merge pull request #1891 from N3X15/refactor-signup
I am dumb and missed the UNIQUE index on this table for some reason.
2014-11-12 16:45:43 -06:00
Rob Nelson
639cf9ecd0 I am dumb and missed the UNIQUE index on this table for some reason. 2014-11-12 14:44:11 -08:00
Chris
c81c187eee MetaStation attempt 2: Electric Boogaloo
This time with working embedded controllers(i hope)!
2014-11-12 16:35:48 -06:00
Chris
99e6a5bea1 Changeloooog 2014-11-12 16:20:26 -06:00
d3athrow
05e5f5d2a4 Merge pull request #1889 from ComicIronic/WrenchWeld
Fixed welding down machines.
2014-11-12 16:19:38 -06:00
d3athrow
265c3525d3 Merge pull request #1890 from N3X15/fix-mecca
Mecca Fixes, pt1
2014-11-12 16:19:19 -06:00
Rob Nelson
3d1b82d948 Changelog update 2014-11-12 12:52:00 -08:00
Rob Nelson
360079082a WHY WHY WHY WHY 2014-11-12 11:50:38 -08:00
Rob Nelson
3d15d71697 Add SMES to mecca scanning blacklist. 2014-11-12 11:36:50 -08:00
Rob Nelson
0ff02b10b0 Mecca Fixes, pt1. WIP.
```yaml
changes:
- tweak: "Device Analyzers can no longer scan some items.  Other items can only be scanned with the traitor variant of the scanner."
- tweak: "Flatpacks take 10-20 seconds to open."
- bugfix: "Flatpacks hit multiple times by a crowbar will only open once."
```
2014-11-12 11:20:18 -08:00
ComicIronic
db4a33166c Fixed welding down machines.
Added the state var to all machines. 0 is unanchored, 1 is anchored, 2 is welded.
Added the WELD_FIXED flag for machines that can be welded down.
Added the weldToFloor proc, which is used to toggle welding down for machines.
Fixed machines not using general procs.
Fixed some relative pathing.
2014-11-12 19:10:11 +00:00
d3athrow
157019ee07 Merge pull request #1888 from N3X15/fix-falsewalls
Fix falsewalls
2014-11-12 12:37:51 -06:00
Rob Nelson
6b0d4a63a7 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into fix-falsewalls 2014-11-12 10:24:38 -08:00
Rob Nelson
c05fdbd585 changelog 2014-11-12 10:23:51 -08:00
Rob Nelson
e25bd1de4d Quick fix for false walls failing to smooth, caused by a runtime. 2014-11-12 09:55:42 -08:00
d3athrow
21cf8c9a90 Merge pull request #1886 from N3X15/fix-borers
More borer fixes.
2014-11-11 21:18:06 -06:00