Commit Graph

12971 Commits

Author SHA1 Message Date
mwerezak 5ddbbc0371 Fixes ammo_magazine icon states being handled incorrectly. 2015-02-09 21:35:37 -05:00
mwerezak fc6dfb5f1b Ammo magazine and casing update
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
2015-02-09 21:32:49 -05:00
MrSnapwalk 05f14ccd84 Updates /obj/item/clothing/under/fluff/parkereliza and adds /obj/item/clothing/suit/fluff/parkereliza to the code. 2015-02-09 19:34:43 -06:00
Atlantiscze 460578b6c7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power 2015-02-10 00:08:54 +01:00
mwerezak d8a8384c41 Fixes errors introduced by merge
Fixes errors introduced by commit
fac32d07e9.

Grabbed the version of projectile.dm from the parent commit and changed
the paths by hand (again).
2015-02-09 17:53:47 -05:00
Chinsky 1c4734c4e3 Merge pull request #8088 from Raptor1628/dev
Paramedic Job Fixed
2015-02-10 01:00:08 +03:00
Atlantiscze 7aa3949621 Removes redundant checks. 2015-02-09 19:37:00 +01:00
Atlantiscze 34e116bbb0 Buffs engineering shuttle SMES to store a bit more power. 2015-02-09 18:54:01 +01:00
Atlantiscze 12be20ed73 Mapping changes preparation
- Adds Red and Blue simple pipes for mapping use.
- Adds empty CO2 PH and N2O canisters for mapping use.
- Reworks asteroid outpost areas. Old areas kept in separate file for downstream compatibility
- Modifies engineering shuttle to work with next commit.
- SMESs no longer have to be charged above certain level (~5%?) to actually begin outputting power.
- Fixes SMES related bug caused by previous commit
2015-02-09 18:53:02 +01:00
Chinsky 4deeebfe3e Merge pull request #8093 from GinjaNinja32/pai_pulling
Fixes pAIs being spammed with "You are too small to pull that." when being pulled
2015-02-09 19:52:32 +03:00
GinjaNinja32 503eb679cc Fixes pAIs being spammed with "You are too small to pull that." when being pulled 2015-02-09 13:32:42 +00:00
GinjaNinja32 42bd4e7fba Storage accessory w_class raised to 3, typo fix 2015-02-09 11:15:19 +00:00
GinjaNinja32 70094884ff Fixes, code cleanup, adds the messenger I forgot last night 2015-02-09 10:41:08 +00:00
GinjaNinja32 538ee11cb1 pAI rework 2015-02-09 01:58:54 +00:00
mwerezak a679d22db8 Cleaner click parameter handling 2015-02-08 19:42:18 -05:00
mwerezak 9e62e08d2e Absolute paths 2015-02-08 19:39:41 -05:00
Atlantiscze 8eb08c2457 Adds more types of magnetic coils
- Adds high capacity, high IO and basic coil types.
- Adds two additional types of SMESs which contain new coil types by default. These will be used in next commit.
2015-02-09 01:14:33 +01:00
Atlantiscze 8160c9538f Shuttle Power Compatibility
- Shuttles may now contain power cables/machines such as SMESs and cables.
2015-02-09 00:22:52 +01:00
Raptor1628 76f4001cc1 Paramedic Job Fixed
Adds Paramedic job as outlined on the forums. Reduces MD access to EVA,
adds some minor EMT clothing stuff, and fixes #8020 and the medgreen
armband while I was piddling around in sprites.
EMT alt title and indent fixed.

Now less broken.

![](http://i.imgur.com/vOSoJy0.png)
2015-02-08 17:23:02 -05:00
GinjaNinja32 4495f4c8ed Fixes possible href exploit with APCs 2015-02-08 19:58:28 +00:00
Kelenius e6dc9d36fd Update for machine upgrades and some science
Also adds RPED and makes biogenerator and borg charger constructible .
2015-02-08 15:39:11 +03:00
SkyMarshal a78ef81712 To make PsiOmegaDelta happy
I hate this format.  Bluh bluh huge bitch
2015-02-08 04:04:06 -07:00
SkyMarshal c8d6214657 Fix indent thing for pointdefense 2015-02-08 04:03:19 -07:00
SkyMarshal 84c40171e7 The icarus gun now acts as a spotter. The Icarus can now be fired via adminverbs. 2015-02-08 04:03:19 -07:00
SkyMarshal dadea3c7fa Adds two admin weapons and refactors wall damage code.
The Icarus is now fireable in gun form.  The point defense mode fires several lasers one after the other so that it can penetrate.  The main gun mode fires a modified meteor.  Also added an "abstract weapon" which has the projectile type settable for admin shenanigans.
Walls now lack an armor variable, which is replaced with buffed health.  Normal walls take 4 shots with a normal laser or 5 emitter bursts to destroy.  Reinforced walls now take 20 normal laser shots or 28 emitter shots.
Added some proactive runtime protection to logging for projectile impacts.  Without a valid firer, the jump button is linked to the victim.
2015-02-08 04:01:35 -07:00
Chinsky de3e81657d Added moar sanity. 2015-02-08 12:45:50 +03:00
Chinsky 30de86c081 Accessories update.
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
2015-02-08 12:35:50 +03:00
Kelenius 71dabeb557 Fixes ore scanner
Before: it didn't scan dark tiles and the tile you were standing on.
Now: scans both.
2015-02-08 05:52:12 +03:00
RKF45 13f09d95c8 Juice paints 2015-02-08 01:17:10 +01:00
RKF45 db6ff13f5f No painting ghosts!
Holograms can be coloured, though
2015-02-07 23:59:34 +01:00
Ccomp5950 8f2720b179 Merge pull request #8052 from mwerezak/boolit
New bullet types, projectile refactor
2015-02-07 14:07:22 -05:00
mwerezak fac32d07e9 Merge remote-tracking branch 'upstream/dev' into boolit
Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
2015-02-07 00:57:04 -05:00
Chinsky 03125b97f4 Merge pull request #8056 from PsiOmegaDelta/ATMMachine
Corrects some RAS syndrome issues
2015-02-07 08:39:59 +03:00
Chinsky fdd27dec21 Merge pull request #8078 from Ccomp5950/mentors
Added buttons back to Mentors
2015-02-07 08:24:30 +03:00
Ccomp5950 33e2fae704 Merge pull request #7967 from Kelenius/ofSlimesAndHumans
Update for the slimes
2015-02-07 00:20:13 -05:00
Ccomp5950 3ba295dadb Merge pull request #8073 from Loganbacca/projectilescleanup
Code cleanup
2015-02-07 00:17:24 -05:00
ccomp5950 a07e0a044f Added buttons back to Mentors
Before:  Mentors see ahelps they only see ckeys, no links no character names, etc.

Now:  Character names shows up and I've added a mentor specific link bar so mentors can use the buttons they already have easily.
2015-02-07 00:04:50 -05:00
mwerezak 414ad6b6da Merge remote-tracking branch 'upstream/dev' into pacman
Conflicts:
	code/modules/power/port_gen.dm
2015-02-06 23:32:39 -05:00
Zuhayr 402987edc3 Merge with dev. 2015-02-07 14:44:55 +10:30
mwerezak 0b8940da79 Merge remote-tracking branch 'upstream/dev' into boolit 2015-02-06 20:23:05 -05:00
mwerezak 5494b4d8c9 Supply packs, autolathe recipes, magazine and box definitions. 2015-02-06 20:16:35 -05:00
unknown 39b467c9da New bullet types, projectile rewrite
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.

* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
2015-02-06 20:09:32 -05:00
RKF45 5fc1ae395d All cleaning removes paint
Paint works on mobs and objects
2015-02-07 01:41:08 +01:00
Loganbacca 7cc440aecc Absolute paths
- Cleaned up projectile.dm and beams.dm
2015-02-07 13:37:12 +13:00
GinjaNinja32 0651bb8d84 Adds a cache to scramble() so that feeding the same input through multiple times in a short timespan results in the same output string.
This means that you'll no longer get the radio message being entirely different from the non-radio message, and that all players will see the same scrambled string
2015-02-06 23:26:09 +00:00
RKF45 0ad5195af2 Cleaning up 2015-02-06 23:55:11 +01:00
GinjaNinja32 c95399de91 Fixes "" from languages over radio. 2015-02-06 19:43:39 +00:00
GinjaNinja32 f0e92023f0 Fixes startup runtime
Fixes #8062
2015-02-06 08:54:28 +00:00
Chinsky 3ddd0b480f Merge pull request #8061 from Baystation12/master
master -> wiz
2015-02-06 10:41:12 +03:00
Chinsky 3df6d38d2d Merge pull request #8047 from Neerti/1_30_2015_new_shuttle
Expanded Escape/Transfer Shuttle
2015-02-06 02:32:04 +03:00