faf6e95ce3
Revert "Revert "Major map change+misc changes""
...
This reverts commit f0d4f38bf1
2020-01-12 01:19:47 -05:00
f0d4f38bf1
Revert "Major map change+misc changes"
...
This reverts commit fd22b5ca87
2020-01-12 01:16:31 -05:00
fd22b5ca87
Major map change+misc changes
...
Moves holodeck next to AI core,
expands botany and kitchen, adds fishfarm
Adds photocopiers and pappershredders about.
Fixes some bad cameras,
adds detective pistol back in, Why wasn't it there prior?
Adds ballestics back in.
2020-01-11 18:41:51 -05:00
838f5e9418
Merge remote-tracking branch 'upstream/master'
2020-01-06 00:47:53 +00:00
c3079004ea
GameMaster Tuning ( #6593 )
...
* Actually Game Master but I am an idiot.
2020-01-05 01:39:28 -05:00
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
0d40994226
Fixes galore & New away mission
...
Beach Away mission is Now Whiskey Station Mission.
Fixes a large number of bugs from github (Help me pls)
2019-12-16 23:12:56 -05:00
3b7a737c08
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-16 00:52:29 -05:00
3c9731879a
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
2019-12-09 17:15:36 -05:00
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
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
99bc3dcdbc
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
a45472b446
Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 19:22:38 -05:00
a3fb3e3950
Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin
2019-10-29 09:33:48 +10:00
3c8cd11eac
Reupdated Station 1 map
2019-10-24 21:57:58 +01:00
6b2c7cc29a
Update energy.dm
2019-10-21 19:54:30 -04:00
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
2cc8800ede
Merge remote-tracking branch 'upstream/master'
2019-10-08 15:14:36 +01:00
93bbae11e7
Merge pull request #6475 from R1f72r/Phoronboreupgrade
...
Allows you to upgrade Phoron Bore with manipulators
2019-10-08 04:22:06 -04:00
89aad128cf
Blind port of Bay Radiation Subsystem
2019-10-06 03:30:36 -04:00
74cc210e21
Merge remote-tracking branch 'server/master' into map
2019-10-05 23:10:09 +01:00
691a1239f4
Merge from Vorestation
2019-09-29 21:53:09 +01:00
6e4fc794d6
Merge pull request #6467 from Heroman3003/datum-timer-beam
...
Makes every single shot not create ~40 timers but 1
2019-09-27 16:07:25 -04:00
b22f2284fe
Merge remote-tracking branch 'upstream/master'
2019-09-23 20:55:18 +01:00
93cf2d41e1
fix gun handle_suicide
2019-09-21 15:01:55 +03:00
14d6527103
delete KHI
2019-09-14 13:17:20 -04:00
6d4ec50e08
Merge remote-tracking branch 'upstream/master'
2019-09-01 19:02:01 +01:00
aa2a3682b9
Merge remote-tracking branch 'VOREStation/master' into medbeam
2019-08-31 15:32:22 -04:00
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
69ed422019
Adds Laser Tag Turrets Plus Changes ( #6324 )
...
* Adds Laser Tag Turrets
* Adds changelog
* Reverts Lethal Turrets Shooting to Kill
* Small No Longer Means Misc Life
* Revert "Merge branch 'master' into Turret"
This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.
* Revert "Revert "Merge branch 'master' into Turret""
This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.
* Github why
* Change laser.dm to master?
* Revert "Change laser.dm to master?"
This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
2019-07-27 15:45:58 -04:00
3fcc7e1465
Merge pull request #5500 from VOREStation/upstream-merge-6285
...
[MIRROR] Adds the SLED.
2019-07-24 06:24:34 -04:00
f519272525
Merge pull request #6290 from Mechoid/SubMunitions
...
Adds Submunition projectiles, and a laser gun showcasing them.
2019-07-23 23:35:05 -04:00
a6d7c4ee81
Merge pull request #6285 from Mechoid/SLED
...
Adds the SLED.
2019-07-23 16:21:42 -04:00
8654b6bdf4
Merge remote-tracking branch 'upstream/master'
2019-07-19 22:05:31 +01:00
9325f590ca
Mining Expansion, the Diggening.
2019-07-13 03:48:38 -04:00
124afe1cbc
Merge remote-tracking branch 'upstream/master'
2019-07-07 18:41:28 +01:00
f18b82aa2b
Merge pull request #6268 from Heroman3003/targetfix
...
Fixes aiming at z-shadows breaking aiming
2019-07-06 21:34:03 -04:00
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01:00
3d31a77514
Multi-Tile Objects, Multi-Tile Hovershuttle
2019-07-01 20:43:53 -04:00
d5f380984f
Medbeam
2019-06-29 20:04:47 +01:00
d9ebf54db0
Adds two new alternate sprites for the detective's revolver. ( #6230 )
...
* Adds the sprites
* This should do things.
2019-06-28 21:23:42 -04:00
7bb9c92c9a
Merge remote-tracking branch 'upstream/master'
2019-06-03 12:31:48 +01:00
f78a4e1dc8
Sif Trees and Icon Scaling
2019-05-28 13:21:39 -04:00
c2d90f5c3f
Merge remote-tracking branch 'upstream/master'
2019-05-23 22:46:42 +01:00
7a35723d85
Sif Animal Expansion 1
2019-05-21 19:58:19 -04:00
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
703c27da7e
Refactors shadekin
2019-04-28 15:10:06 +10:00
RadiantFlash7