Commit Graph

17065 Commits

Author SHA1 Message Date
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
6e3391f723 Merge pull request #8079 from mwerezak/doors
Fixes doors being usable remotely when broken
2015-02-08 13:11:52 +03: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
mwerezak
2d744fd47a Fixes doors being usable remotely when broken
Fixes airlock doors being able to be opened and closed remotely (by
buttons, airlocks, or docking) when broken. Also removes some redundant
code, and refactors a few checks.
2015-02-07 17:52:16 -05: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
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
2c78d480f1 Mops clean paint too
For painted walls, I guess
2015-02-07 00:18:56 +01:00
RKF45
0ad5195af2 Cleaning up 2015-02-06 23:55:11 +01:00
RKF45
172282b638 Cleaning up paint buckets
Remover is finally gone
2015-02-06 23:40:54 +01:00
RKF45
76cfa4fb40 Named crayons 2015-02-06 23:22:05 +01:00
GinjaNinja32
c95399de91 Fixes "" from languages over radio. 2015-02-06 19:43:39 +00:00
Zuhayr
7c31bb18f5 Merge pull request #8064 from GinjaNinja32/lingfix
Fixes changeling stings not working from certain positions
2015-02-07 05:46:13 +10:30
Zuhayr
caa4e088cd Merge pull request #8057 from mwerezak/master
Fixes windows taking excessive damage from projectiles
2015-02-07 02:34:03 +10:30
Zuhayr
5c7a217d40 Merge pull request #8060 from comma/polaroid
Adjustable tint windows
2015-02-06 22:44:16 +10:30
GinjaNinja32
251e162a2c Fixes changeling sting A* call, adds messages to let the changeling know what went wrong if it did 2015-02-06 09:52:01 +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
b83f1ac3d2 Adjustable tint windows. Use buttons to change opacity. Super advanced technology to introduce milder alternative to metal shutters everywhere. 2015-02-06 10:33:41 +03:00
Chinsky
3ea720fd9d Buttons refactoring. Introduced wonders of inheritance, cutting down on inconsistencies and copypaste. 2015-02-06 09:53:05 +03:00
mwerezak
41816c26bf Fixes windows taking excessive damage from projectiles 2015-02-06 00:03:09 -05: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
Neerti
22ac05f9a0 Turns out, a new path isn't needed in the first place, and the bugs I found was me being dumb. Isn't that just grand?
Reverts the /nolatejoin path.
2015-02-05 16:41:00 -05:00
Chinsky
3384f13a31 Merge pull request #8029 from GinjaNinja32/viro
Virology rework
2015-02-06 00:18:13 +03:00
Chinsky
2100c51905 Merge pull request #8042 from PsiOmegaDelta/HearItSayIt
Silicons now have some timestamped input
2015-02-06 00:15:15 +03:00
Chinsky
abd3396a13 Merge pull request #8041 from PsiOmegaDelta/SetMyName
Silicons can now more easily be correctly renamed.
2015-02-06 00:15:07 +03:00
Chinsky
fc4e6796ce Merge pull request #8035 from PsiOmegaDelta/CanHasNano
NanoUI/Topic make-over
2015-02-06 00:15:04 +03:00
Zuhayr
43d576dcc5 Merge pull request #8054 from mwerezak/chembottles
Replaces chem bottles with their overlay equivalents
2015-02-05 23:05:45 +10:30
PsiOmega
a073cba477 Merge remote-tracking branch 'upstream/dev' into CanHasNano
Conflicts:
	code/setup.dm
2015-02-05 12:37:15 +01:00
PsiOmega
50064d86b3 Corrects ATM Machine syndromes. 2015-02-05 11:56:00 +01:00
mwerezak
9caf76d069 Glass bottles are now dispensed with the lid on
It seemed kind of silly that vendors, for example, would dispense
bottles with their lids off.
2015-02-05 00:41:59 -05:00
mwerezak
8da0fb7f43 Merge remote-tracking branch 'upstream/dev' into chembottles
Conflicts:
	code/modules/hydroponics/hydro_tools.dm - flags var
2015-02-05 00:37:19 -05:00
mwerezak
59bbf3a883 Replaces chem bottles with their overlay equivalents 2015-02-05 00:31:56 -05:00