Arokha Sieyes
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Mechoid
5efc484595
Makes knives all knives.
2018-01-12 18:02:07 -08:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Neerti
3dfa7edb34
Removes Cracked Asteroids from Sif Mountains
...
Hackfix but it works fairly well.
2017-11-26 03:57:56 -05:00
killer653
cafac8efae
Polaris Sync
2017-08-28 20:52:11 -04:00
Spades
8498880ee6
Fixed the only few instances this gun appears
2017-08-07 23:53:23 -04:00
killer653
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
LorenLuke
b7f5362276
See https://github.com/Baystation12/Baystation12/pull/14404 .
...
(ignore point 13)
2017-07-16 16:03:31 -07:00
Leshana
197a648795
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Anewbe
491ae6ac9b
Merge pull request #3475 from SpadesNeil/aces-gun-stuff
...
Path naming of ammo to be consistent, and also fixes some gun things
2017-05-31 18:11:25 -05:00
Yoshax
ef2883ff7e
Drop pod issue fix
2017-05-30 16:32:40 +01:00
Spades
8579adcc53
Naming convention of ammo is now consistent
...
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
Leshana
5f5ea3ea3b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
...
# Conflicts:
# code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
# code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
# code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
# code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
# code/game/machinery/computer/Operating.dm
# code/game/machinery/computer/camera.dm
# code/game/machinery/computer/communications.dm
# code/game/machinery/computer/security.dm
# code/game/machinery/computer/skills.dm
# code/game/objects/items/devices/radio/jammer.dm
# html/changelogs/.all_changelog.yml
# maps/~map_system/maps.dm
# nano/images/nanomap_z1.png
# nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
MagmaRam
2a42f9ef55
Merge pull request #3405 from Anewbe/bullet_swap
...
Makes the 556 and 762 calibers more appropriate to their naming
2017-05-21 13:17:58 -05:00
Leshana
5ae26332fa
Merge branch 'master' into aro-tether-wip
...
# Conflicts:
# code/ZAS/_docs.dm
# code/game/area/areas.dm
# code/game/objects/explosion.dm
# code/modules/holodeck/HolodeckControl.dm
# code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Arokha Sieyes
3fc249bf8b
Tether 1,8 work
...
Adds solar farm to the left of z1
2017-05-04 17:48:21 -04:00
Leshana
44ff1a70c6
Removes the datum pool, as it is not performant.
...
* Creating new objects is cheap, in fact comparable to the cost of getting it out of the pool, so it doesn't help there.
* Placing items in the pool is far more expensive than letting them garbage collect due to the resetting of vars and such.
2017-05-04 01:58:33 -04:00
Anewbe
58b9c63ec2
Makes the 556 and 762 calibers more appropriate to their naming
2017-05-01 20:25:43 -05:00
Leshana
45058136e2
Replace opacity = X with set_opacity(X) so that the lighting system can update propertly.
2017-04-11 22:36:48 -04:00
Anewbe
7417bef794
Boots are now a subtype of shoes
2017-02-05 16:17:41 -06:00
Yoshax
547053a768
if you don't rename all of something, bad things happen m'kay kids
2017-02-04 15:46:03 +00:00
MagmaRam
190a2bc70c
Replaces [stack]/fifty atoms with atoms that spawn the normal stack
...
The stack/fifty objects were really buggy, this should fix all of that in one go.
2016-12-17 17:27:04 -06:00
Neerti
393c9899a9
Adds Asteroid Cracks
...
Adds a new type of turf, which is a cracked asteroid floor. It is functionally a space tile, which means air can escape through the cracks and into the void. These cracks can be plugged by building a floor over them using rods and tiles. The cracks are generated randomly along with the asteroid whenever a floor is placed, with a 1 in 10 chance of it being a cracked floor.
2016-10-02 06:26:44 -04:00
Yoshax
079ce6a71f
Grammar fix + Ensures Christmas drop pod has trees
2016-07-23 15:23:54 +01:00
Yoshax
fd9e8616e3
Ensure laser warfare drop pod has laser proof armor
2016-07-13 20:10:44 +01:00
Yoshax
51876c97fe
Adjusts the crates and adds one more
2016-07-12 22:53:20 +01:00
Yoshax
628a878199
Refactors the drop pod contents to make them a tad more useful and interesting
2016-07-12 22:45:15 +01:00
Yoshax
c60407e6f4
Adds fifty stacks for all material stacks and makes drop pod actually drop fifties
2016-07-10 03:40:24 +01:00
Datraen
fe9d3fd4c4
Merge pull request #1027 from Kelenius/mobCleanup
...
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Kelenius
1afd4af7bb
Optimizes restart
...
Cuts 7-8 seconds
2016-03-16 14:49:37 +03:00
Kelenius
acc78a8000
Changes types of ghosts and eyes
...
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``
Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
Zuhayr
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
Zuhayr
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
Mark9013100
a4b891f5ef
Replaces the standard .45 pistol with the Detective's.
2015-12-20 15:36:26 -05:00
Zuhayr
f2cc74d588
# This is a combination of 2 commits.
...
# The first commit's message is:
Rewriting the mining turfs to reduce worldstart lag.
# This is the 2nd commit message:
Map cleanup.
2015-12-16 15:26:38 +10:30
PsiOmegaDelta
f382626075
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/asteroid.dm
code/game/verbs/ooc.dm
code/modules/admin/verbs/icarus.dm
code/modules/mob/living/silicon/robot/robot_items.dm
code/modules/projectiles/projectile/special.dm
code/modules/random_map/random_map.dm
code/setup.dm
2015-12-13 10:15:29 +01:00
Zuhayr
7a9d7bf0c9
Fixes #10753
2015-12-10 10:41:48 +10:30
Zuhayr
0c23217d7c
Fixes drop pods activating each other's doors.
2015-12-02 19:54:57 +10:30
Zuhayr
f4c9bc4be6
Amending some loc setting lines.
2015-08-25 12:40:09 +09:30
Zuhayr
77e0a72911
Adding tag to droppod mobs prior to being moved into the target area.
2015-08-24 19:13:43 +09:30
Zuhayr
b702c81060
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
...
Conflicts:
code/game/turfs/simulated/floor_types.dm
2015-08-22 03:57:12 +09:30
Zuhayr
8e0ff6c69f
Runtime fix (hopefully), less dangerous qdel loop for pods.
2015-08-22 03:53:03 +09:30
Zuhayr
c8baafed2a
Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
...
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
PsiOmegaDelta
985acc9f70
Changes the supply drop types into datums. Simplifies adding additional supply packs.
2015-08-13 12:11:18 +02:00
Zuhayr
f6df7df714
Added diona gestalt preset.
2015-08-13 16:59:37 +09:30
Zuhayr
231eaf7e76
Added antag uplink option for hacked supply pod.
2015-08-13 16:59:18 +09:30
Zuhayr
a8b801b377
Added supply beacon.
2015-08-13 16:59:18 +09:30
Zuhayr
1b840a6efc
More work on pods, added personnel pod.
2015-08-13 16:59:18 +09:30
Zuhayr
31ffc91d47
Added supply drops.
2015-08-13 16:59:17 +09:30
